diff options
author | Jeff King <peff@peff.net> | 2015-03-20 06:13:36 -0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-03-20 11:35:57 -0700 |
commit | 8bafd20fd97f5101d1c2c8a332864a2cbc97ce0b (patch) | |
tree | 3b4d710e4f45654cba6855aed9210082c8b23ee9 /Documentation/howto/revert-a-faulty-merge.txt | |
parent | t0005: fix broken &&-chains (diff) | |
download | tgif-8bafd20fd97f5101d1c2c8a332864a2cbc97ce0b.tar.xz |
t4104: drop hand-rolled error reporting
This use of "||" fools --chain-lint into thinking the
&&-chain is broken (and indeed, it is somewhat broken; a
failure of update-index in these tests would show the patch
file, even if we never got to the part of the test where we
fed the patch to git-apply).
The extra blocks were there to include more debugging
output, but it hardly seems worth it; the user should know
which command failed (because git-apply will produce error
messages) and can look in the trash directory themselves.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/howto/revert-a-faulty-merge.txt')
0 files changed, 0 insertions, 0 deletions