merge-recursive: move current_{file,directory}_set to struct merge_options
authorMiklos Vajna <vmiklos@frugalware.org>
Wed, 3 Sep 2008 17:08:56 +0000 (19:08 +0200)
committerJunio C Hamano <gitster@pobox.com>
Fri, 5 Sep 2008 05:50:43 +0000 (22:50 -0700)
commit696ee23cc1817a5064780600374589d3a773a081
tree3cd9127b5fb52918ef3458d40a15bd888738826a
parentc7d849243a4be2c60ff48cc42ea8b0518bb7f27f
merge-recursive: move current_{file,directory}_set to struct merge_options

Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
merge-recursive.c
merge-recursive.h