| commit | 5033639c951da27fc4d4becbc3e46dc05096ce63 | |
| author | Miklos Vajna <vmiklos@frugalware.org> | |
| Tue, 2 Sep 2008 21:30:09 +0000 (2 23:30 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 4 Sep 2008 02:06:17 +0000 (3 19:06 -0700) | ||
| tree | d2ac86b6317628604cb1329b6e835f70404789f0 | treesnapshot (tar.gz zip) |
| parent | 6eb1b437933e075bd84c5cdcf5de95ed4db4820f | commitdiff |
merge-recursive: move call_depth 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 |