merge & sequencer: unify codepaths that write "Conflicts:" hint

diff --git a/sequencer.h b/sequencer.h
index 1fc22dcabe132cd437e7b0d3c56588c8cd7e63f2..c53519d9c0c0c5881c1f62e757ae48a24699fcae 100644 (file)
--- 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