am: suppress apply errors when using 3-way
authorStephen Boyd <bebarino@gmail.com>
Tue, 16 Jun 2009 22:32:58 +0000 (15:32 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 18 Jun 2009 16:50:25 +0000 (09:50 -0700)
commit3ddd170...23fcf24af8c4a321ed9c73cda532986e
tree3b7f6f6...02c8b54d5dd7e073ecee977d862eff17copy hash to clipboard (tree)
parentb3c32ea...20bc4d3baa6cffe00dd862f069463869copy hash to clipboard (diff)
git-am.sh