mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
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>
This commit is contained in:
parent
03e2b630f0
commit
ab20fda992
|
@ -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
|
||||||
'
|
'
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue