Douwe Maan 254dbad8f7 Fix bug where conflict view would have one too many context sections		2016-08-12 23:24:51 +03:00
..
file.rb	Fix bug where conflict view would have one too many context sections	2016-08-12 23:24:51 +03:00
file_collection.rb	Add more tests for conflicts	2016-08-12 23:24:48 +03:00
parser.rb	Fix specs	2016-08-12 23:24:46 +03:00