4 commits

Author	SHA1	Message	Date
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
Sean McGivern	7cb76ce1c6	Add workaround for JS error in spec ... These JS errors are only thrown in PhantomJS, and enough of the page is rendered properly that this spec passes. We should remove this in future.	2016-08-17 11:15:05 +01:00
Fatih Acet	f6aa91700a	Fix failed test because of a copy change.	2016-08-12 23:24:51 +03:00
Sean McGivern	ce7eb4e492	Add more tests for conflicts	2016-08-12 23:24:48 +03:00