X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=builtin%2Fmerge.c;h=37d414b3ba95162953aec001e6036956eb1a97f6;hb=af655431f53c20e3d0ed236544397c69974267f4;hp=64c6c6f393ffd9a8cc55883cac863c6ab09639a8;hpb=c674d0527396e4100454e8992ed7381ee29dd54e;p=git.git

diff --git a/builtin/merge.c b/builtin/merge.c
index 64c6c6f39..37d414b3b 100644
--- 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;