| commit | c7d849243a4be2c60ff48cc42ea8b0518bb7f27f | |
| author | Miklos Vajna <vmiklos@frugalware.org> | |
| Wed, 3 Sep 2008 00:30:03 +0000 (3 02:30 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 5 Sep 2008 05:50:43 +0000 (4 22:50 -0700) | ||
| tree | 49a8aa4deb18ccbfc50833bc2e02239d2810cd48 | treesnapshot (tar.gz zip) |
| parent | b7fa51da9be3cee9e2ca31af4edfec18b8ecbce7 | commitdiff |
merge-recursive: move the global obuf to struct merge_options
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
| merge-recursive.c | diffblobblamehistory | |
| merge-recursive.h | diffblobblamehistory |