diff options
author | Miklos Vajna <vmiklos@frugalware.org> | 2008-09-03 19:08:56 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-09-04 22:50:43 -0700 |
commit | 696ee23cc1817a5064780600374589d3a773a081 (patch) | |
tree | 3cd9127b5fb52918ef3458d40a15bd888738826a /thread-utils.c | |
parent | c7d849243a4be2c60ff48cc42ea8b0518bb7f27f (diff) | |
download | git-696ee23cc1817a5064780600374589d3a773a081.tar.gz |
merge-recursive: move current_{file,directory}_set to struct merge_options
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Diffstat (limited to 'thread-utils.c')
0 files changed, 0 insertions, 0 deletions