-
Robert Speicher authored
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
75ed0e27
To find the state of this project's repository at the time of any of these versions, check out
the tags.