X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=merge-recursive.h;h=b831293b3865ae52584565039e4a893c3c6f45ff;hb=8718e875080767f2c8d06c55c3fb5a6dddf0e5a0;hp=344e47694c1a2561f0c79d59747d49604116e8b7;hpb=4b05548fc0523744b7a1276cfa0f4aae19d6d9c9;p=git.git

diff --git a/merge-recursive.h b/merge-recursive.h
index 344e47694..b831293b3 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