From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 13 Jun 2012 05:57:57 +0000 (-0700)
Subject: apply: tests for the --3way option
X-Git-Tag: v1.7.12-rc0~31^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/fdac508933cb2b5265d0bb239eaa50aaa5e64981?hp=fdac508933cb2b5265d0bb239eaa50aaa5e64981

apply: tests for the --3way option

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---