2 commits

Author	SHA1	Message	Date
Sean McGivern	ce7eb4e492	Add more tests for conflicts	2016-08-12 23:24:48 +03:00
Sean McGivern	a1c7961217	Handle multiple merge conflict files in collection	2016-08-12 23:24:43 +03:00