changelogs/unreleased/32983-merge-conflict-resolution-removed-the-newline-in-the-end-of-file.yml · 459d8d65ad41ef3533ea5946c6c5bf38010856f3 · Forest Godfrey / gitlab-ce

BigW Consortium Gitlab

Keep trailing newline when picking conflict sections · f99941d7

authored May 31, 2017

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.

f99941d7

32983-merge-conflict-resolution-removed-the-newline-in-the-end-of-file.yml 98 Bytes

Replace 32983-merge-conflict-resolution-removed-the-newline-in-the-end-of-file.yml