summaryrefslogtreecommitdiff
path: root/sequencer.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-11-10 17:56:39 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-11-10 17:56:39 (GMT)
commit216d29ef257e48f95bc14765d5da17e7854a3109 (patch)
tree7cd0e31b75f442d9ae146f222b102b9982bd60ce /sequencer.h
parentd52adf1f328162a9513940913ced044d24c0212f (diff)
parent261f315bebfa9af2d09f20211960100ff06f87cb (diff)
downloadgit-216d29ef257e48f95bc14765d5da17e7854a3109.zip
git-216d29ef257e48f95bc14765d5da17e7854a3109.tar.gz
git-216d29ef257e48f95bc14765d5da17e7854a3109.tar.bz2
Merge branch 'jc/conflict-hint' into cc/interpret-trailers-more
* jc/conflict-hint: merge & sequencer: turn "Conflicts:" hint into a comment builtin/commit.c: extract ignore_non_trailer() helper function merge & sequencer: unify codepaths that write "Conflicts:" hint builtin/merge.c: drop a parameter that is never used git-tag.txt: Add a missing hyphen to `-s`
Diffstat (limited to 'sequencer.h')
-rw-r--r--sequencer.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/sequencer.h b/sequencer.h
index db43e9c..5ed5cb1 100644
--- a/sequencer.h
+++ b/sequencer.h
@@ -53,5 +53,6 @@ int sequencer_pick_revisions(struct replay_opts *opts);
extern const char sign_off_header[];
void append_signoff(struct strbuf *msgbuf, int ignore_footer, unsigned flag);
+void append_conflicts_hint(struct strbuf *msgbuf);
#endif