aboutsummaryrefslogtreecommitdiffstats
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2023-04-22 20:17:15 +0000
committerJunio C Hamano <gitster@pobox.com>2023-04-24 12:47:32 -0700
commitd4ff2072abed071bc9fd291d179162da46d1427f (patch)
treeb2baa025a1bd1b8bf65346695fc422f27367bbb9 /merge-recursive.c
parentb388633c5c47bf4fc12560d8b237ec0bd319ba4a (diff)
downloadgit-d4ff2072abed071bc9fd291d179162da46d1427f.tar.gz
match-trees.h: move declarations for match-trees.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 d4d2ab05b2..8e87b6386d 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -22,6 +22,7 @@
#include "hex.h"
#include "ll-merge.h"
#include "lockfile.h"
+#include "match-trees.h"
#include "object-file.h"
#include "object-name.h"
#include "object-store.h"