Denton Liu 1a2b985fb3 cherry-pick/revert: add scissors line on merge conflict ...

Fix a bug where the scissors line is placed after the Conflicts:
section, in the case where a merge conflict occurs and
commit.cleanup = scissors.

Helped-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

2019-04-19 12:05:36 +09:00

46 KiB

Raw Blame History

View Raw