diff options
| author | Denton Liu <liu.denton@gmail.com> | 2019-04-17 13:23:30 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-04-19 06:05:36 +0300 |
| commit | 1a2b985fb375e7ce14932bfc59365024af2fb6ab (patch) | |
| tree | 037601e08fa0b4b958b8342b77f991c75799ca97 /sequencer.h | |
| parent | dc42e9a83a9e9206566b6bc9b57f431b98682b29 (diff) | |
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>
Diffstat (limited to 'sequencer.h')
| -rw-r--r-- | sequencer.h | 3 |
1 files changed, 2 insertions, 1 deletions
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); |