5 commits

Author	SHA1	Message	Date
Sean McGivern	24424d932f	Fix merge conflict size limit	2016-09-07 16:00:26 +01:00
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	18398152fa	Raise errors for large and binary files	2016-08-12 23:24:44 +03:00
Sean McGivern	a1c7961217	Handle multiple merge conflict files in collection	2016-08-12 23:24:43 +03:00
Sean McGivern	df2ed097b7	Add backend for merge conflicts reading	2016-08-12 23:24:43 +03:00