diff --git a/builtin/merge.c b/builtin/merge.c
index ff875f1f050a20ada976462ce326ac8347390573..37d414b3ba95162953aec001e6036956eb1a97f6 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
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;
return ret;
}
-static int checkout_fast_forward(unsigned char *head, unsigned char *remote)
+int checkout_fast_forward(const unsigned char *head, const unsigned char *remote)
{
struct tree *trees[MAX_UNPACK_TREES];
struct unpack_trees_options opts;