diff options
| author | Miklos Vajna <vmiklos@frugalware.org> | 2008-08-12 18:45:14 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-30 20:46:54 -0700 |
| commit | 9047ebbc229bf5b99d6c7522293b8cbd1100b747 (patch) | |
| tree | d5524f2922348d8c7b3b7b3506e32611edc25188 /contrib/persistent-https/socket.go | |
| parent | Merge branch 'maint' (diff) | |
| download | git-9047ebbc229bf5b99d6c7522293b8cbd1100b747.tar.gz git-9047ebbc229bf5b99d6c7522293b8cbd1100b747.zip | |
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>
Diffstat (limited to 'contrib/persistent-https/socket.go')
0 files changed, 0 insertions, 0 deletions