Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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>
- Loading branch information