index 2928107bb135004e11f6a11a625067545680b62a..6dcb100a6cfc1b1d311602507bc3dcb483c1558d 100644 (file)
--- a/cache.h
+++ b/cache.h
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 */