treewide: remove cache.h inclusion due to object.h changes

[thirdparty/git.git] / ll-merge.c

diff --git a/ll-merge.c b/ll-merge.c
index 130d26501c69cd47b762f13b46ff4835cfa6261a..28bc94c45d63015bd6eb7f971d4e78bf55a4deba 100644 (file)
--- a/ll-merge.c
+++ b/ll-merge.c
@@ -6,11 +6,13 @@
 
 #include "cache.h"
 #include "config.h"
+#include "convert.h"
 #include "attr.h"
 #include "xdiff-interface.h"
 #include "run-command.h"
 #include "ll-merge.h"
 #include "quote.h"
+#include "wrapper.h"
 
 struct ll_merge_driver;