diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-02-09 16:41:16 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-02-09 16:41:16 -0800 |
| commit | 06938a37dca9bb19784c1bd41e90c99a7c8f8e5e (patch) | |
| tree | 25be5b409d7bba815b9e99abc2ccdb4a0230ed2c /merge-recursive.h | |
| parent | a8e4a5943a63c8fd4a3a9b70ccf4608bcc973707 (diff) | |
| parent | 67ac1e1d57e45899a4dfd900a0249f48507584b5 (diff) | |
| download | git-06938a37dca9bb19784c1bd41e90c99a7c8f8e5e.tar.gz | |
Merge branch 'jn/cherry-pick-strategy-option'
* jn/cherry-pick-strategy-option:
cherry-pick/revert: add support for -X/--strategy-option
Diffstat (limited to 'merge-recursive.h')
| -rw-r--r-- | merge-recursive.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/merge-recursive.h b/merge-recursive.h index c8135b0ec7..981ed6ac94 100644 --- a/merge-recursive.h +++ b/merge-recursive.h @@ -57,6 +57,8 @@ struct tree *write_tree_from_memory(struct merge_options *o); int parse_merge_opt(struct merge_options *out, const char *s); /* builtin/merge.c */ -int try_merge_command(const char *strategy, struct commit_list *common, const char *head_arg, struct commit_list *remotes); +int try_merge_command(const char *strategy, size_t xopts_nr, + const char **xopts, struct commit_list *common, + const char *head_arg, struct commit_list *remotes); #endif |