summaryrefslogtreecommitdiff
path: root/sequencer.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-10-24 11:34:59 -0700
committerJunio C Hamano <gitster@pobox.com>2014-10-24 11:34:59 -0700
commit75c961b767ec061696634c1079dbe5f1a9e10f93 (patch)
tree427dd8822ab47c3f4ad827022bf73a8d9b6d4271 /sequencer.h
parent08e3ce5a20d738746b2a7700be6d3954bf01a2b9 (diff)
downloadgit-75c961b767ec061696634c1079dbe5f1a9e10f93.tar.gz
merge & sequencer: unify codepaths that write "Conflicts:" hint
Two identical loops in suggest_conflicts() in merge, and do_recursive_merge() in sequencer, can use a single helper function extracted from the latter that prepares the "Conflicts:" hint that is meant to remind the user the paths for which merge conflicts had to be resolved to write a better commit log message. Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 1fc22dcabe..c53519d9c0 100644
--- a/sequencer.h
+++ b/sequencer.h
@@ -51,5 +51,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