kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity
gitlab-org--gitlab-foss/changelogs/unreleased/32983-merge-conflict-resolu...

5 lines
98 B
YAML
Raw Normal View History

Keep trailing newline when picking conflict sections 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.
2017-05-31 07:02:29 -04:00
---
title: Keep trailing newline when resolving conflicts by picking sides
merge_request:
author: