diff options
Diffstat (limited to 'changelogs/unreleased/32983-merge-conflict-resolution-removed-the-newline-in-the-end-of-file.yml')
-rw-r--r-- | changelogs/unreleased/32983-merge-conflict-resolution-removed-the-newline-in-the-end-of-file.yml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/changelogs/unreleased/32983-merge-conflict-resolution-removed-the-newline-in-the-end-of-file.yml b/changelogs/unreleased/32983-merge-conflict-resolution-removed-the-newline-in-the-end-of-file.yml new file mode 100644 index 00000000000..eca42176501 --- /dev/null +++ b/changelogs/unreleased/32983-merge-conflict-resolution-removed-the-newline-in-the-end-of-file.yml @@ -0,0 +1,4 @@ +--- +title: Keep trailing newline when resolving conflicts by picking sides +merge_request: +author: |