builtin/merge: make checkout_fast_forward() non static

diff --git a/cache.h b/cache.h
index d454b7e686d6461162a85ef9c5f752eea401f51a..3cce9077cc0c27fba6621f933de284e1dec85c9b 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -1040,4 +1040,7 @@ void overlay_tree_on_cache(const char *tree_name, const char *prefix);
 char *alias_lookup(const char *alias);
 int split_cmdline(char *cmdline, const char ***argv);
 
+/* builtin/merge.c */
+int checkout_fast_forward(const unsigned char *from, const unsigned char *to);
+
 #endif /* CACHE_H */