Sean McGivern 7af277f683 Auto-highlight conflict when rich_text is called		2016-08-12 23:24:43 +03:00
..
file.rb	Auto-highlight conflict when rich_text is called	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	Auto-highlight conflict when rich_text is called	2016-08-12 23:24:43 +03:00