diff options
Diffstat (limited to 'merge-recursive.h')
| -rw-r--r-- | merge-recursive.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/merge-recursive.h b/merge-recursive.h index c5fbe79..37ff99a 100644 --- a/merge-recursive.h +++ b/merge-recursive.h @@ -55,6 +55,8 @@ int merge_recursive_generic(struct merge_options *o, void init_merge_options(struct merge_options *o); 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); |