diff options
Diffstat (limited to 'sequencer.h')
| -rw-r--r-- | sequencer.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sequencer.h b/sequencer.h index 1fc22dcabe..5ed5cb1d97 100644 --- a/sequencer.h +++ b/sequencer.h @@ -37,6 +37,8 @@ struct replay_opts { int mainline; + const char *gpg_sign; + /* Merge strategy */ const char *strategy; const char **xopts; @@ -51,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 |