| commit | 696ee23cc1817a5064780600374589d3a773a081 | |
| author | Miklos Vajna <vmiklos@frugalware.org> | |
| Wed, 3 Sep 2008 17:08:56 +0000 (3 19:08 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 5 Sep 2008 05:50:43 +0000 (4 22:50 -0700) | ||
| tree | 3cd9127b5fb52918ef3458d40a15bd888738826a | treesnapshot (tar.gz zip) |
| parent | c7d849243a4be2c60ff48cc42ea8b0518bb7f27f | commitdiff |
merge-recursive: move current_{file,directory}_set 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 |