kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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

Signed-off-by: Brian Gernhardt <benji@silverinsanity.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
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 git --no-pager diff --cached --check >test.out
test $? = 2 test $? = 2
) && ) &&
test "$(grep "conflict marker" test.out | wc -l)" = 3 && test 3 = $(grep "conflict marker" test.out | wc -l) &&
git reset --hard git reset --hard
' '