Sean McGivern 44eb3197a9 Handle non-UTF-8 conflicts gracefully ... These can't be resolved in the UI because if they aren't in a UTF-8 compatible encoding, they can't be rendered as JSON. Even if they could, we would be implicitly changing the file encoding anyway, which seems like a bad idea.		2016-08-25 08:27:08 +01:00
..
file_collection_spec.rb	Add more tests for conflicts	2016-08-12 23:24:48 +03:00
file_spec.rb	Find match line headers by backtracking	2016-08-12 23:24:48 +03:00
parser_spec.rb	Handle non-UTF-8 conflicts gracefully	2016-08-25 08:27:08 +01:00