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>
2023-05-16 06:33:54 +00:00
parent eaa966db79
commit 750324ddb8
6 changed files with 21 additions and 11 deletions
--- a/merge.c
+++ b/merge.c
@ -4,6 +4,7 @@
 #include "gettext.h"
 #include "hex.h"
 #include "lockfile.h"
+#include "merge.h"
 #include "commit.h"
 #include "run-command.h"
 #include "resolve-undo.h"