summaryrefslogtreecommitdiff
path: root/contrib/examples/git-merge.sh
diff options
context:
space:
mode:
authorLibravatar Jonathan Nieder <jrnieder@gmail.com>2010-10-31 02:41:08 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-11-09 15:20:44 -0800
commit33fc521193746a0961c270997dbb881b520ad793 (patch)
treedf3efbeecff9826bbe66aceab42cc30abb8dad40 /contrib/examples/git-merge.sh
parentt3404: do not use 'describe' to implement test_cmp_rev (diff)
downloadtgif-33fc521193746a0961c270997dbb881b520ad793.tar.xz
t4124 (apply --whitespace): use test_might_fail
Use test_might_fail instead of ignoring the exit status from git config --unset, and let the exit status propagate past rm -f (which does not fail on ENOENT). Otherwise bugs that lead git config to crash would not be detected when this test runs. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/examples/git-merge.sh')
0 files changed, 0 insertions, 0 deletions