git-am: give better diagnostics when the patch does not apply during --3way
authorJunio C Hamano <junkio@cox.net>
Sat, 12 Aug 2006 23:16:47 +0000 (16:16 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 13 Aug 2006 00:08:07 +0000 (17:08 -0700)
commitfd7bcfb...24a3313ef5361bdd8493ba50635f50f0
tree1e8d0af...82644caa330a7a552777c7b61768d6eecopy hash to clipboard (tree)
parent022f25e...d4bd3eaed6bb6d80a242f8930687d483copy hash to clipboard (diff)
git-am.sh