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>

diff --git a/builtin/merge.c b/builtin/merge.c
index ff875f1f050a20ada976462ce326ac8347390573..64c6c6f393ffd9a8cc55883cac863c6ab09639a8 100644 (file)
--- 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");
 }
 
                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;
 {
        const char **args;
        int i = 0, x = 0, ret;

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);
 
 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
 #endif