From 750324ddb876b54f52578df26278bf99c1e51eb9 Mon Sep 17 00:00:00 2001
From: Elijah Newren <newren@gmail.com>
Date: Tue, 16 May 2023 06:33:54 +0000
Subject: merge.h: move declarations for merge.c from cache.h

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

(limited to 'builtin/pull.c')

diff --git a/builtin/pull.c b/builtin/pull.c
index 0c7bac97b7..eb60c9d52f 100644
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -12,6 +12,7 @@
 #include "builtin.h"
 #include "gettext.h"
 #include "hex.h"
+#include "merge.h"
 #include "object-name.h"
 #include "parse-options.h"
 #include "exec-cmd.h"
-- 
cgit 1.2.3-korg