diff options
Diffstat (limited to 'sequencer.h')
| -rw-r--r-- | sequencer.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sequencer.h b/sequencer.h index 1fc22dcab..c53519d9c 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 |