summaryrefslogtreecommitdiff
path: root/git-merge-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-01-26 11:40:09 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-01-26 11:40:09 -0800
commite7d7a56796c457b0a96e58e7638950db824b52af (patch)
tree891c2c9d425ab9e6c2833ba8afdeb9d876c8c3d8 /git-merge-resolve.sh
parentgit-p4: Change p4 command invocation (diff)
downloadtgif-e7d7a56796c457b0a96e58e7638950db824b52af.tar.xz
t9801: do not overuse test_must_fail
test_must_fail is to make sure a program we can potentially break during the course of updating git itself exits with a non-zero status in a clean and controlled way. When we expect a non-zero exit status from the commands we use from the underlying platform in tests, e.g. making sure a string "error: " does not appear in the output by running "grep 'error: '", just use "! grep" for readability. It is not like we will try to update Git and suddenly 'grep' we use from the system starts segfaulting. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions