Robert Speicher 75ed0e27d9 Merge branch '21247-mergerequestscontroller-conflicts-may-fail-with-iso-8859-data' into 'master' ... Handle non-UTF-8 conflicts gracefully ## What does this MR do? If a conflict file isn't in a UTF-8-compatible encoding, we can't resolve it in the UI. ## What are the relevant issue numbers? Closes #21247. See merge request !5961		2016-08-25 19:08:38 +00:00
..
file.rb	Handle case where conflicts aren't on disk yet	2016-08-25 12:34:54 +01:00
file_collection.rb	Add more tests for conflicts	2016-08-12 23:24:48 +03:00
parser.rb	Handle non-UTF-8 conflicts gracefully	2016-08-25 08:27:08 +01:00