summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 03e2b63)
raw | patch | inline | side by side (parent: 03e2b63)
author | Brian Gernhardt <benji@silverinsanity.com> | |
Sun, 29 Jun 2008 20:49:06 +0000 (16:49 -0400) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Sun, 29 Jun 2008 22:11:50 +0000 (15:11 -0700) |
Signed-off-by: Brian Gernhardt <benji@silverinsanity.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t4017-diff-retval.sh | patch | blob | history |
diff --git a/t/t4017-diff-retval.sh b/t/t4017-diff-retval.sh
index d748d45daec54ec3fa4be2229dbafebd879493eb..60dd2014d5ae5d5e9e168b8b60278d90ef93cc53 100755 (executable)
--- a/t/t4017-diff-retval.sh
+++ b/t/t4017-diff-retval.sh
git --no-pager diff --cached --check >test.out
test $? = 2
) &&
- test "$(grep "conflict marker" test.out | wc -l)" = 3 &&
+ test 3 = $(grep "conflict marker" test.out | wc -l) &&
git reset --hard
'