From c674d0527396e4100454e8992ed7381ee29dd54e Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Wed, 31 Mar 2010 21:22:07 +0200 Subject: merge: make function try_merge_command non static Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano --- merge-recursive.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'merge-recursive.h') diff --git a/merge-recursive.h b/merge-recursive.h index d1192f56d7..0cc465ec5d 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 -- cgit v1.2.3