summaryrefslogtreecommitdiff
path: root/merge-recursive.h
diff options
context:
space:
mode:
authorChristian Couder <chriscool@tuxfamily.org>2010-03-31 21:22:07 +0200
committerJunio C Hamano <gitster@pobox.com>2010-04-01 11:14:10 -0700
commitc674d0527396e4100454e8992ed7381ee29dd54e (patch)
tree2180d1998b7d49ce0fd721e36a2377f348d74c9e /merge-recursive.h
parent3f9083cde3b434155c274168f166ffce2bb243e7 (diff)
downloadgit-c674d0527396e4100454e8992ed7381ee29dd54e.tar.gz
merge: make function try_merge_command non static
Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.h')
-rw-r--r--merge-recursive.h3
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