diff options
Diffstat (limited to 'changelogs/unreleased/allow-resolving-conflicts-in-utf-8.yml')
| -rw-r--r-- | changelogs/unreleased/allow-resolving-conflicts-in-utf-8.yml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/changelogs/unreleased/allow-resolving-conflicts-in-utf-8.yml b/changelogs/unreleased/allow-resolving-conflicts-in-utf-8.yml new file mode 100644 index 00000000000..c3c877423ff --- /dev/null +++ b/changelogs/unreleased/allow-resolving-conflicts-in-utf-8.yml @@ -0,0 +1,4 @@ +--- +title: Fix conflict resolution when files contain valid UTF-8 characters +merge_request: +author: |