diff options
| author | Elijah Newren <newren@gmail.com> | 2023-05-16 06:33:54 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-06-21 13:39:53 -0700 |
| commit | 750324ddb876b54f52578df26278bf99c1e51eb9 (patch) | |
| tree | d3d8e94b02b80bedab684d6d9402f42b710fa14f /builtin/merge.c | |
| parent | eaa966db798ca8b0313396f11fe7edfa78c2ddae (diff) | |
| download | git-750324ddb876b54f52578df26278bf99c1e51eb9.tar.gz | |
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>
Diffstat (limited to 'builtin/merge.c')
| -rw-r--r-- | builtin/merge.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index 8da3e46abb..6e8f7b9bb5 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" |