aboutsummaryrefslogtreecommitdiffstats
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2023-04-22 20:17:09 +0000
committerJunio C Hamano <gitster@pobox.com>2023-04-24 12:47:31 -0700
commitcb2a51356d3019582128a818aea533ccd11f42c0 (patch)
tree6d0ce1d25618f84fbcd5fa9713722b474ed22fb9 /merge-recursive.c
parenttreewide: be explicit about dependence on strbuf.h (diff)
downloadgit-cb2a51356d3019582128a818aea533ccd11f42c0.tar.gz
git-cb2a51356d3019582128a818aea533ccd11f42c0.zip
symlinks.h: move declarations for symlinks.c functions 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 9875bdb11c..d4d2ab05b2 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -30,6 +30,7 @@
#include "string-list.h"
#include "submodule-config.h"
#include "submodule.h"
+#include "symlinks.h"
#include "tag.h"
#include "tree-walk.h"
#include "unpack-trees.h"