merge-ll: rename from ll-merge

[thirdparty/git.git] / apply.c

diff --git a/apply.c b/apply.c
index 3636bc14c2dfd482fcc146b3c560d908caccd919..2f66f93fec583ddc67870c14859dd9f096776421 100644 (file)
--- a/apply.c
+++ b/apply.c
@@ -7,9 +7,10 @@
  *
  */
 
-#include "cache.h"
+#include "git-compat-util.h"
 #include "abspath.h"
 #include "alloc.h"
+#include "base85.h"
 #include "config.h"
 #include "object-store.h"
 #include "blob.h"
@@ -20,16 +21,22 @@
 #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"
 
 struct gitdiff_data {