| commit | 750324ddb876b54f52578df26278bf99c1e51eb9 | [log] [tgz] |
|---|---|---|
| author | Elijah Newren <newren@gmail.com> | Tue May 16 06:33:54 2023 +0000 |
| committer | Junio C Hamano <gitster@pobox.com> | Wed Jun 21 13:39:53 2023 -0700 |
| tree | d3d8e94b02b80bedab684d6d9402f42b710fa14f | |
| parent | eaa966db798ca8b0313396f11fe7edfa78c2ddae [diff] [blame] |
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>
diff --git a/builtin/merge.c b/builtin/merge.c index 8da3e46..6e8f7b9 100644 --- a/builtin/merge.c +++ b/builtin/merge.c
@@ -37,6 +37,7 @@ #include "color.h" #include "rerere.h" #include "help.h" +#include "merge.h" #include "merge-recursive.h" #include "merge-ort-wrappers.h" #include "resolve-undo.h"