Signed-off-by: Brian Gernhardt <benji@silverinsanity.com>
---
t/t4017-diff-retval.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Also: we have t4017-diff-retval and t4017-quiet. Should one of
these be renamed?
Show changes to t/t4017-diff-retval.sh +1 −1
diff --git a/t/t4017-diff-retval.sh b/t/t4017-diff-retval.sh
index d748d45..60dd201 100755
--- a/t/t4017-diff-retval.sh
+++ b/t/t4017-diff-retval.sh
@@ -123,7 +123,7 @@ test_expect_success 'check detects leftover conflict markers' '
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
'
--
1.5.6.105.g6f4b
Brian Gernhardt