merge.h: move declarations for merge.c from cache.h
commit750324ddb876b54f52578df26278bf99c1e51eb9
authorElijah Newren <newren@gmail.com>
Tue, 16 May 2023 06:33:54 +0000 (16 06:33 +0000)
committerJunio C Hamano <gitster@pobox.com>
Wed, 21 Jun 2023 20:39:53 +0000 (21 13:39 -0700)
treed3d8e94b02b80bedab684d6d9402f42b710fa14f
parenteaa966db798ca8b0313396f11fe7edfa78c2ddae
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/merge.c
builtin/pull.c
cache.h
merge.c
merge.h [new file with mode: 0644]
sequencer.c