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>
Christian Couder committed
Mar 31, 2010 at 21:22 UTC
c674d0527396e4100454e8992ed7381ee29dd54e
2 files changed
+5
-2
builtin/merge.c
+2
-2
@@ -548,8 +548,8 @@ static void write_tree_trivial(unsigned char *sha1)
548
die("git write-tree failed to write a tree");
549
}
550
551
-static int try_merge_command(const char *strategy, struct commit_list *common,
552
- const char *head_arg, struct commit_list *remotes)
551
+int try_merge_command(const char *strategy, struct commit_list *common,
552
+ const char *head_arg, struct commit_list *remotes)
553
{
554
const char **args;
555
int i = 0, x = 0, ret;
merge-recursive.h
+3
@@ -54,4 +54,7 @@ int merge_recursive_generic(struct merge_options *o,
54
void init_merge_options(struct merge_options *o);
55
struct tree *write_tree_from_memory(struct merge_options *o);
56
57
+/* builtin/merge.c */
58
+int try_merge_command(const char *strategy, struct commit_list *common, const char *head_arg, struct commit_list *remotes);
59
+
60
#endif