From df6e8744966bfa66ff289f58372bb060fdc6a124 Mon Sep 17 00:00:00 2001 From: Elijah Newren Date: Tue, 16 May 2023 06:34:00 +0000 Subject: diff.h: remove unnecessary include of oidset.h This also made it clear that several .c files depended upon various things that oidset included, but had omitted the direct #include for those headers. Add those now. Signed-off-by: Elijah Newren Signed-off-by: Junio C Hamano --- merge.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'merge.c') diff --git a/merge.c b/merge.c index 83bcba6943..b60925459c 100644 --- a/merge.c +++ b/merge.c @@ -2,10 +2,12 @@ #include "diff.h" #include "diffcore.h" #include "gettext.h" +#include "hash.h" #include "hex.h" #include "lockfile.h" #include "merge.h" #include "commit.h" +#include "repository.h" #include "run-command.h" #include "resolve-undo.h" #include "tree.h" -- cgit v1.2.3