merge-recursive: introduce merge_options
authorMiklos Vajna <vmiklos@frugalware.org>
Mon, 25 Aug 2008 14:25:57 +0000 (16:25 +0200)
committerJunio C Hamano <gitster@pobox.com>
Sun, 31 Aug 2008 03:46:54 +0000 (20:46 -0700)
commit8a2fce1...95c058945d8e2dbd8cb7456cc7450ad8
tree5a5b882...510adea8f39b4f9262b58f8a70f35008copy hash to clipboard (tree)
parent73118f8...b81f5a3ed1bb56e2517627d56e9ebdfbcopy hash to clipboard (diff)
builtin-checkout.c
builtin-merge-recursive.c
merge-recursive.c
merge-recursive.h