merge: make function try_merge_command non static
authorChristian Couder <chriscool@tuxfamily.org>
Wed, 31 Mar 2010 19:22:07 +0000 (21:22 +0200)
committerJunio C Hamano <gitster@pobox.com>
Thu, 1 Apr 2010 18:14:10 +0000 (11:14 -0700)
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/merge.c
merge-recursive.h

index ff875f1f050a20ada976462ce326ac8347390573..64c6c6f393ffd9a8cc55883cac863c6ab09639a8 100644 (file)
@@ -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;
index d1192f56d797a1664f5bfb5028d52ad679928e23..0cc465ec5d13385dd8ecdbd64387cf937c82bce3 100644 (file)
@@ -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