undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge: make function try_merge_command non static

Browse Source 
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Christian Couder 2010-03-31 21:22:07 +02:00 committed by Junio C Hamano
parent 3f9083cde3
commit c674d05273
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/merge.c
View File

@ -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, int try_merge_command(const char *strategy, struct commit_list *common,
const char *head_arg, struct commit_list *remotes) const char *head_arg, struct commit_list *remotes)
{ {
const char **args; const char **args;
int i = 0, x = 0, ret; int i = 0, x = 0, ret;

3
merge-recursive.h
View File

@ -54,4 +54,7 @@ int merge_recursive_generic(struct merge_options *o,
void init_merge_options(struct merge_options *o); void init_merge_options(struct merge_options *o);
struct tree *write_tree_from_memory(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