X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=merge-recursive.h;h=0cc465ec5d13385dd8ecdbd64387cf937c82bce3;hb=770c54170a43ffb3810088a85f25c59c0cbf7b38;hp=d1192f56d797a1664f5bfb5028d52ad679928e23;hpb=7b575f3c387f7fd1b204af71a02b3faa74fb7798;p=git.git

diff --git a/merge-recursive.h b/merge-recursive.h
index d1192f56d..0cc465ec5 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