Sean McGivern 24424d932f Fix merge conflict size limit		2016-09-07 16:00:26 +01:00
..
file.rb	Handle case where conflicts aren't on disk yet	2016-08-25 12:34:54 +01:00
file_collection.rb	Add more tests for conflicts	2016-08-12 23:24:48 +03:00
parser.rb	Fix merge conflict size limit	2016-09-07 16:00:26 +01:00