summaryrefslogtreecommitdiff
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
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>
-rw-r--r--builtin/merge.c4
-rw-r--r--merge-recursive.h3
2 files changed, 5 insertions, 2 deletions
diff --git a/builtin/merge.c b/builtin/merge.c
index ff875f1f05..64c6c6f393 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -548,8 +548,8 @@ static void write_tree_trivial(unsigned char *sha1)
die("git write-tree failed to write a tree");
}
-static int try_merge_command(const char *strategy, struct commit_list *common,
- const char *head_arg, struct commit_list *remotes)
+int try_merge_command(const char *strategy, struct commit_list *common,
+ const char *head_arg, struct commit_list *remotes)
{
const char **args;
int i = 0, x = 0, ret;
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