From: Denton Liu <liu.denton@gmail.com>
Date: Wed, 17 Apr 2019 10:23:30 +0000 (+0100)
Subject: cherry-pick/revert: add scissors line on merge conflict
X-Git-Tag: v2.22.0-rc0~28^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/1a2b985fb375e7ce14932bfc59365024af2fb6ab?hp=1a2b985fb375e7ce14932bfc59365024af2fb6ab

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>
---