Robert Speicher 80a6d2fda2 Use :empty_project where possible throughout spec/lib		2017-01-25 12:25:42 -05:00
..
file_collection_spec.rb	Add more tests for conflicts	2016-08-12 23:24:48 +03:00
file_spec.rb	Use :empty_project where possible throughout spec/lib	2017-01-25 12:25:42 -05:00
parser_spec.rb	Fix merge conflict size limit	2016-09-07 16:00:26 +01:00