aboutsummaryrefslogtreecommitdiffstats
path: root/merge.h
AgeCommit message (Collapse)AuthorFilesLines
2023-06-21merge.h: move declarations for merge.c from cache.hElijah Newren1-0/+17
Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>