Merge branch 'maint'

diff --git a/builtin/merge.c b/builtin/merge.c
index 64c6c6f393ffd9a8cc55883cac863c6ab09639a8..37d414b3ba95162953aec001e6036956eb1a97f6 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -676,7 +676,7 @@ static int count_unmerged_entries(void)
        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;