Handle non-UTF-8 conflicts gracefully
Merged
requested to merge 21247-mergerequestscontroller-conflicts-may-fail-with-iso-8859-data into master
If a conflict file isn't in a UTF-8-compatible encoding, we can't resolve it in the UI.
Is the regex the best way of doing this?
It's a bug in a new feature
Closes #21247 (closed).
master
(if you do - rebase it please)