git-instaweb: Put httpd logs in a "$httpd_only" subdirectory

diff --git a/merge-recursive.h b/merge-recursive.h
index d1192f56d797a1664f5bfb5028d52ad679928e23..0cc465ec5d13385dd8ecdbd64387cf937c82bce3 100644 (file)
--- 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