Johannes Schindelin 15980deab9 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>

2016-01-27 10:21:53 -08:00

10 KiB

Executable File

Raw Blame History

View Raw