summaryrefslogtreecommitdiffstats
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2023-05-16 08:33:50 +0200
committerJunio C Hamano <gitster@pobox.com>2023-06-21 22:39:53 +0200
commitf5653856c26efb2ce722148060518817af2ab023 (patch)
tree3b0291ab941ea62464de82524b8eac0ae059e2b2 /merge-recursive.c
parentrun-command.h: move declarations for run-command.c from cache.h (diff)
downloadgit-f5653856c26efb2ce722148060518817af2ab023.tar.xz
git-f5653856c26efb2ce722148060518817af2ab023.zip
name-hash.h: move declarations for name-hash.c from cache.h
Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
-rw-r--r--merge-recursive.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/merge-recursive.c b/merge-recursive.c
index 8e87b6386d..b341ba4f38 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -23,6 +23,7 @@
#include "ll-merge.h"
#include "lockfile.h"
#include "match-trees.h"
+#include "name-hash.h"
#include "object-file.h"
#include "object-name.h"
#include "object-store.h"