apply: fall back on three-way merge
authorJunio C Hamano <gitster@pobox.com>
Fri, 8 Jun 2012 16:54:10 +0000 (09:54 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 9 Jul 2012 21:39:21 +0000 (14:39 -0700)
commit519d1a5...4e044459bd7323cfa6a7cb98cec5c884
treefb5639f...9ea9cf083b852710ddede20dfea3a2d1copy hash to clipboard (tree)
parentcfb6f9a...c392561bb339763564e21b684e50ce83copy hash to clipboard (diff)
builtin/apply.c