From ab20fda99236e38edf5d63f964b6b920b494aacb Mon Sep 17 00:00:00 2001 From: Brian Gernhardt Date: Sun, 29 Jun 2008 16:49:06 -0400 Subject: [PATCH] Fix t4017-diff-retval for white-space from wc Signed-off-by: Brian Gernhardt Signed-off-by: Junio C Hamano --- t/t4017-diff-retval.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t4017-diff-retval.sh b/t/t4017-diff-retval.sh index d748d45dae..60dd2014d5 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 ' -- 2.11.4.GIT