X-Git-Url: http://git.tremily.us/?a=blobdiff_plain;f=builtin%2Fmerge-tree.c;h=19917426fba19cf60b838ff9b07d20b5e44259a5;hb=9b01f0038b63ccdf697b2387f4fcd4b03bd249d5;hp=9b25ddc9794efe489ee9ec9fd3203ffa997f03f7;hpb=1a9fe453263137be7d42e6fbfc041b5b2d9521d7;p=git.git

diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c
index 9b25ddc97..19917426f 100644
--- a/builtin/merge-tree.c
+++ b/builtin/merge-tree.c
@@ -1,4 +1,4 @@
-#include "cache.h"
+#include "builtin.h"
 #include "tree-walk.h"
 #include "xdiff-interface.h"
 #include "blob.h"