diff options
Diffstat (limited to 'merge-recursive.h')
| -rw-r--r-- | merge-recursive.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/merge-recursive.h b/merge-recursive.h index d1192f56d7..0cc465ec5d 100644 --- a/merge-recursive.h +++ b/merge-recursive.h @@ -54,4 +54,7 @@ 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); +/* builtin/merge.c */ +int try_merge_command(const char *strategy, struct commit_list *common, const char *head_arg, struct commit_list *remotes); + #endif |