summaryrefslogtreecommitdiff
path: root/ll-merge.c
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2023-04-22 20:17:23 +0000
committerJunio C Hamano <gitster@pobox.com>2023-04-24 12:47:33 -0700
commit5e3f94dfe3c69bc2a711a9dc3b1635e7ff91ab54 (patch)
tree22e5311dc7a262a2f42cba2b801348baa717dc15 /ll-merge.c
parent53dca334d6c56488994c0c80a247707419cddbfc (diff)
downloadgit-5e3f94dfe3c69bc2a711a9dc3b1635e7ff91ab54.tar.gz
treewide: remove cache.h inclusion due to previous changes
Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'll-merge.c')
-rw-r--r--ll-merge.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ll-merge.c b/ll-merge.c
index 85517e668e..1993530688 100644
--- a/ll-merge.c
+++ b/ll-merge.c
@@ -4,7 +4,7 @@
* Copyright (c) 2007 Junio C Hamano
*/
-#include "cache.h"
+#include "git-compat-util.h"
#include "config.h"
#include "convert.h"
#include "attr.h"