Miklos Vajna 9047ebbc22 Split out merge_recursive() to merge-recursive.c ...

Move most of the of code from builtin-merge-recursive.c to a new file
merge-recursive.c and introduce merge_recursive_setup() in there so that
builtin-merge-recursive and other builtins call it.

Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

2008-08-30 20:46:54 -07:00

43 KiB

Raw Blame History

View Raw