![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Stephen Boyd <bebarino@gmail.com> | |
| Tue, 16 Jun 2009 22:32:58 +0000 (15:32 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 18 Jun 2009 16:50:25 +0000 (09:50 -0700) | ||
| commit | 3ddd170323fcf24af8c4a321ed9c73cda532986e | |
| tree | 3b7f6f6002c8b54d5dd7e073ecee977d862eff17 | tree | snapshot |
| parent | b3c32ead20bc4d3baa6cffe00dd862f069463869 | commit | diff |
am: suppress apply errors when using 3-way
git-am with 3-way outputs errors when applying, even though the
3-way will usually be successful. We suppress these errors from
git-apply because they are not "true" errors until the 3-way has been
attempted.
Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-am with 3-way outputs errors when applying, even though the
3-way will usually be successful. We suppress these errors from
git-apply because they are not "true" errors until the 3-way has been
attempted.
Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-am.sh | diff | blob | history |