diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2019-06-11 07:25:01 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2019-06-11 07:25:01 +0000 |
| commit | 641d332351907b77b53b0cb23ff51ccea2489824 (patch) | |
| tree | e53598605beef0ece77fbb4403324ad336d24ac5 /changelogs/unreleased | |
| parent | c9216d630554132a8403cf251d122f93e44f2772 (diff) | |
| parent | df650eaae5f94357f155c9b35c51a6b8c98fb6d7 (diff) | |
| download | gitlab-ce-641d332351907b77b53b0cb23ff51ccea2489824.tar.gz | |
Merge branch 'sh-fix-utf-8-encoding-resolve-conflicts' into 'master'
Fix UTF-8 conversion issues when resolving conflicts
Closes #63062
See merge request gitlab-org/gitlab-ce!29453
Diffstat (limited to 'changelogs/unreleased')
| -rw-r--r-- | changelogs/unreleased/sh-fix-utf-8-encoding-resolve-conflicts.yml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/sh-fix-utf-8-encoding-resolve-conflicts.yml b/changelogs/unreleased/sh-fix-utf-8-encoding-resolve-conflicts.yml new file mode 100644 index 00000000000..31039099788 --- /dev/null +++ b/changelogs/unreleased/sh-fix-utf-8-encoding-resolve-conflicts.yml @@ -0,0 +1,5 @@ +--- +title: Fix UTF-8 conversion issues when resolving conflicts +merge_request: 29453 +author: +type: fixed |