]> git.ipfire.org Git - thirdparty/git.git/blobdiff - apply.c
merge-ll: rename from ll-merge
[thirdparty/git.git] / apply.c
diff --git a/apply.c b/apply.c
index 6212ab3a1b3958cd56c8c3e199a3f0ed35de1488..2f66f93fec583ddc67870c14859dd9f096776421 100644 (file)
--- a/apply.c
+++ b/apply.c
@@ -7,7 +7,7 @@
  *
  */
 
-#include "cache.h"
+#include "git-compat-util.h"
 #include "abspath.h"
 #include "alloc.h"
 #include "base85.h"
 #include "gettext.h"
 #include "hex.h"
 #include "xdiff-interface.h"
-#include "ll-merge.h"
+#include "merge-ll.h"
 #include "lockfile.h"
+#include "name-hash.h"
 #include "object-name.h"
 #include "object-file.h"
 #include "parse-options.h"
+#include "path.h"
 #include "quote.h"
+#include "read-cache.h"
 #include "rerere.h"
 #include "apply.h"
 #include "entry.h"
 #include "setup.h"
 #include "symlinks.h"
+#include "wildmatch.h"
 #include "ws.h"
 #include "wrapper.h"