diff options
| author | Sean McGivern <sean@gitlab.com> | 2017-05-31 12:02:29 +0100 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2017-06-01 14:04:21 +0100 |
| commit | f99941d7ec212a8b19f982717d9c974966c91a1e (patch) | |
| tree | 44114147cb20e495fc4a96a7207045875afcba28 /changelogs | |
| parent | 228926daee799c95e752a3c284c860e5bc60e528 (diff) | |
| download | gitlab-ce-f99941d7ec212a8b19f982717d9c974966c91a1e.tar.gz | |
Keep trailing newline when picking conflict sections32983-merge-conflict-resolution-removed-the-newline-in-the-end-of-file
If our side of the conflict file has a trailing newline, and we are picking
sections, not editing the whole content, then add a trailing newline back.
Diffstat (limited to 'changelogs')
| -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: |