| commit | 15980deab9f41324aba5cc9536e463d204bafe63 | |
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | |
| Wed, 27 Jan 2016 16:37:40 +0000 (27 17:37 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 27 Jan 2016 18:21:53 +0000 (27 10:21 -0800) | ||
| tree | 2d0d00313010c98c5d1fd96d4dacc655c23aa4af | treesnapshot (tar.gz zip) |
| parent | 86efa215276aaeaef0c556c73f1993b6f36dcf91 | commitdiff |
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>
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>
| t/t6023-merge-file.sh | diffblobblamehistory | |
| xdiff/xmerge.c | diffblobblamehistory |