Fix earlier mismerges.

diff --git a/builtin-rm.c b/builtin-rm.c
index 0beb86dc3dd13610da14afe77c96a2a1ea34573b..e7793a20f5c38ff31d4a74b7e1cec50b9a9f252e 100644 (file)
--- a/builtin-rm.c
+++ b/builtin-rm.c
@@ -6,6 +6,7 @@
 #include "cache.h"
 #include "builtin.h"
 #include "dir.h"
+#include "cache-tree.h"
 
 static const char builtin_rm_usage[] =
 "git-rm [-n] [-v] [-f] <filepattern>...";