diff options
| author | Christian Couder <chriscool@tuxfamily.org> | 2010-03-31 19:22:07 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-04-01 18:14:10 (GMT) |
| commit | c674d0527396e4100454e8992ed7381ee29dd54e (patch) | |
| tree | 2180d1998b7d49ce0fd721e36a2377f348d74c9e /merge-recursive.h | |
| parent | 3f9083cde3b434155c274168f166ffce2bb243e7 (diff) | |
| download | git-c674d0527396e4100454e8992ed7381ee29dd54e.zip git-c674d0527396e4100454e8992ed7381ee29dd54e.tar.gz git-c674d0527396e4100454e8992ed7381ee29dd54e.tar.bz2 | |
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 'merge-recursive.h')
| -rw-r--r-- | merge-recursive.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/merge-recursive.h b/merge-recursive.h index d1192f5..0cc465e 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 |