X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=builtin%2Fmerge-tree.c;h=19917426fba19cf60b838ff9b07d20b5e44259a5;hb=c2e86addb86689306b992065328ec52aa2479658;hp=9b25ddc9794efe489ee9ec9fd3203ffa997f03f7;hpb=3d045897585c4b1ca0dce6bb5a33331f1b48c2bf;p=thirdparty%2Fgit.git

diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c
index 9b25ddc979..19917426fb 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"