apply: tests for the --3way option
authorJunio C Hamano <gitster@pobox.com>
Wed, 13 Jun 2012 05:57:57 +0000 (22:57 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 10 Jul 2012 06:50:10 +0000 (23:50 -0700)
commitfdac508933cb2b5265d0bb239eaa50aaa5e64981
tree299cea45791dd09c2f35080801da533b3dcb4acc
parent78fb67f31edbdcde3580f9abc1048f4630ef1bee
apply: tests for the --3way option

Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t4108-apply-threeway.sh