f99941d7ec
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.
4 lines
98 B
YAML
4 lines
98 B
YAML
---
|
|
title: Keep trailing newline when resolving conflicts by picking sides
|
|
merge_request:
|
|
author:
|