Skip to content

Commit

Permalink
Fix t4017-diff-retval for white-space from wc
Browse files Browse the repository at this point in the history
Signed-off-by: Brian Gernhardt <benji@silverinsanity.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Brian Gernhardt authored and Junio C Hamano committed Jun 29, 2008
1 parent 03e2b63 commit ab20fda
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion t/t4017-diff-retval.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
'

Expand Down

0 comments on commit ab20fda

Please sign in to comment.