![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Miklos Vajna <vmiklos@frugalware.org> | |
| Tue, 12 Aug 2008 16:45:14 +0000 (18:45 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 31 Aug 2008 03:46:54 +0000 (20:46 -0700) | ||
| commit | 9047ebbc229bf5b99d6c7522293b8cbd1100b747 | |
| tree | d5524f2922348d8c7b3b7b3506e32611edc25188 | tree | snapshot |
| parent | 7df437e56b5a2c5ec7140dd097b517563db4972c | commit | diff |
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>
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>
| Makefile | diff | blob | history | |
| builtin-merge-recursive.c | diff | blob | history | |
| merge-recursive.c | [new file with mode: 0644] | blob |
| merge-recursive.h | diff | blob | history |