Select Git revision
lib
-
-
- Open in your IDE
- Download source code
- Download this directory
Forked from
GitLab.org / GitLab FOSS
17309 commits behind the upstream repository.
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