Treat D/F conflict entry more carefully in unpack-trees.c::threeway_merge()

diff --git a/cache.h b/cache.h
index 1b50c32b139256c5d8be96a85b02f1ce9855f15a..eb57507b804019f7d6b27a27a2b262d4b051e43b 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -496,4 +496,7 @@ extern void trace_argv_printf(const char **argv, int count, const char *format,
 extern int convert_to_git(const char *path, char **bufp, unsigned long *sizep);
 extern int convert_to_working_tree(const char *path, char **bufp, unsigned long *sizep);
 
+/* match-trees.c */
+void shift_tree(const unsigned char *, const unsigned char *, unsigned char *, int);
+
 #endif /* CACHE_H */