From 41771fa435a44ff8be3f23753bde0309a2a65b03 Mon Sep 17 00:00:00 2001
From: Elijah Newren <newren@gmail.com>
Date: Fri, 24 Feb 2023 00:09:27 +0000
Subject: cache.h: remove dependence on hex.h; make other files include it
 explicitly

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 merge.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'merge.c')

diff --git a/merge.c b/merge.c
index 445b4f19aa..2c8b845684 100644
--- a/merge.c
+++ b/merge.c
@@ -1,6 +1,7 @@
 #include "cache.h"
 #include "diff.h"
 #include "diffcore.h"
+#include "hex.h"
 #include "lockfile.h"
 #include "commit.h"
 #include "run-command.h"
-- 
cgit v1.2.3