development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-07-16 10:38:05 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Fix t4017-diff-retval for white-space from wc

Browse source 
Signed-off-by: Brian Gernhardt <benji@silverinsanity.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Brian Gernhardt 2008-06-29 16:49:06 -04:00 committed by Junio C Hamano
parent 03e2b630f0
commit ab20fda992
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
t/t4017-diff-retval.sh
View file

@ -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
'