Sean McGivern 28ef06c52b Fix merge conflict reading for new diffs		2016-08-12 23:24:43 +03:00
..
file.rb	Allow resolving conflicts in MR controller	2016-08-12 23:24:43 +03:00
file_collection.rb	Fix merge conflict reading for new diffs	2016-08-12 23:24:43 +03:00
parser.rb	Handle multiple merge conflict files in collection	2016-08-12 23:24:43 +03:00