X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft4118-apply-empty-context.sh;h=27cc6f2b88974051cd521755800342e375d84af7;hb=dca3957b8581ffd0faab135191bbee3029953bd2;hp=690a1820032025056307de8926e8f56826c29367;hpb=c379c4b176ce350a8d6c0773a3ad211996d809db;p=git.git diff --git a/t/t4118-apply-empty-context.sh b/t/t4118-apply-empty-context.sh index 690a18200..27cc6f2b8 100755 --- a/t/t4118-apply-empty-context.sh +++ b/t/t4118-apply-empty-context.sh @@ -23,7 +23,8 @@ test_expect_success setup ' cat file2 >file2.orig git add file1 file2 && sed -e "/^B/d" file1 && - sed -e "/^B/d" file2 && + sed -e "/^[BQ]/d" file2 && + echo Q | tr -d "\\012" >>file2 && cat file1 >file1.mods && cat file2 >file2.mods && git diff |