Fall back to three-way merge when applying a patch.
authorJunio C Hamano <junkio@cox.net>
Thu, 6 Oct 2005 21:25:52 +0000 (14:25 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 6 Oct 2005 21:25:52 +0000 (14:25 -0700)
commit47f0b6d...d49247b85898083d1ccf4f899ef7294a
treef693939...8e164e20c33142923ec563eb75252583copy hash to clipboard (tree)
parentbc162e4...ea6dc3208e3bda76301d6409607ed3ffcopy hash to clipboard (diff)
Documentation/git-applymbox.txt
git-applymbox.sh
git-applypatch.sh