From 1a2b985fb375e7ce14932bfc59365024af2fb6ab Mon Sep 17 00:00:00 2001 From: Denton Liu Date: Wed, 17 Apr 2019 11:23:30 +0100 Subject: 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 Signed-off-by: Denton Liu Signed-off-by: Junio C Hamano --- sequencer.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'sequencer.h') diff --git a/sequencer.h b/sequencer.h index 8295c8406f..7023da9b13 100644 --- a/sequencer.h +++ b/sequencer.h @@ -116,7 +116,8 @@ int rearrange_squash(struct repository *r); */ void append_signoff(struct strbuf *msgbuf, size_t ignore_footer, unsigned flag); -void append_conflicts_hint(struct index_state *istate, struct strbuf *msgbuf); +void append_conflicts_hint(struct index_state *istate, + struct strbuf *msgbuf, enum commit_msg_cleanup_mode cleanup_mode); enum commit_msg_cleanup_mode get_cleanup_mode(const char *cleanup_arg, int use_editor); -- cgit v1.3-5-g9baa