diff options
| author |  Johannes Schindelin <johannes.schindelin@gmx.de> | 2016-01-27 17:37:40 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2016-01-27 10:21:53 -0800 |
| commit | 15980deab9f41324aba5cc9536e463d204bafe63 (patch) | |
| tree | 2d0d00313010c98c5d1fd96d4dacc655c23aa4af /t/t9110 | |
| parent | merge-file: let conflict markers match end-of-line style of the context (diff) | |
| download | tgif-15980deab9f41324aba5cc9536e463d204bafe63.tar.xz | |
merge-file: ensure that conflict sections match eol style
In the previous patch, we made sure that the conflict markers themselves
match the end-of-line style of the input files. However, this still left
out the conflicting text itself: if it lacks a trailing newline, we
add one, and should add a carriage return when appropriate, too.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t9110')
0 files changed, 0 insertions, 0 deletions