Split out merge_recursive() to merge-recursive.c

Browse Source

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>

...

This commit is contained in:

Miklos Vajna

2008-08-12 18:45:14 +02:00

committed by Junio C Hamano

parent 7df437e56b

commit 9047ebbc22

4 changed files with 1341 additions and 1324 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1331

merge-recursive.c Normal file

File diff suppressed because it is too large Load Diff