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)
Signed-off-by: Junio C Hamano <gitster@pobox.com>
No differences found