Sean McGivern 24424d932f Fix merge conflict size limit		2016-09-07 16:00:26 +01:00
..
file_collection_spec.rb	Add more tests for conflicts	2016-08-12 23:24:48 +03:00
file_spec.rb	Find match line headers by backtracking	2016-08-12 23:24:48 +03:00
parser_spec.rb	Fix merge conflict size limit	2016-09-07 16:00:26 +01:00