diff options
| author |  Christian Couder <chriscool@tuxfamily.org> | 2010-03-31 21:22:07 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-04-01 11:14:10 -0700 |
| commit | c674d0527396e4100454e8992ed7381ee29dd54e (patch) | |
| tree | 2180d1998b7d49ce0fd721e36a2377f348d74c9e /builtin | |
| parent | merge: refactor code that calls "git merge-STRATEGY" (diff) | |
| download | tgif-c674d0527396e4100454e8992ed7381ee29dd54e.tar.xz | |
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 'builtin')
| -rw-r--r-- | builtin/merge.c | 4 |
1 files changed, 2 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; |