Merge branch 'jf/am-failure-report'
authorJunio C Hamano <gitster@pobox.com>
Thu, 22 Jan 2009 00:51:18 +0000 (16:51 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 22 Jan 2009 00:51:18 +0000 (16:51 -0800)
* jf/am-failure-report:
git-am: re-fix the diag message printing
git-am: Make it easier to see which patch failed

1  2 
git-am.sh
diff --cc git-am.sh
Simple merge