diff options
| author | Stephen Boyd <bebarino@gmail.com> | 2009-06-16 15:32:58 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-06-18 09:50:25 -0700 |
| commit | 3ddd170323fcf24af8c4a321ed9c73cda532986e (patch) | |
| tree | 3b7f6f6002c8b54d5dd7e073ecee977d862eff17 /xdiff-interface.c | |
| parent | b3c32ead20bc4d3baa6cffe00dd862f069463869 (diff) | |
| download | git-3ddd170323fcf24af8c4a321ed9c73cda532986e.tar.gz git-3ddd170323fcf24af8c4a321ed9c73cda532986e.tar.xz | |
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>
Diffstat (limited to 'xdiff-interface.c')
0 files changed, 0 insertions, 0 deletions