X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft4118-apply-empty-context.sh;h=65f2e4c3efb9ae5b5459e15df337e07201d78c38;hb=c32056e0ef193002f80d75fd795e156ddf65c4ab;hp=f92e259cc6f251ec6f89edee3fc16720f264d82f;hpb=f6576f4c0c6fa3b2d979faf28936c09480dedaab;p=git.git diff --git a/t/t4118-apply-empty-context.sh b/t/t4118-apply-empty-context.sh index f92e259cc..65f2e4c3e 100755 --- a/t/t4118-apply-empty-context.sh +++ b/t/t4118-apply-empty-context.sh @@ -20,10 +20,10 @@ test_expect_success setup ' cat file1 && echo Q | tr -d "\\012" } >file2 && - cat file2 >file2.orig + cat file2 >file2.orig && git add file1 file2 && sed -e "/^B/d" file1 && - sed -e "/^[BQ]/d" file2 && + cat file1 > file2 && echo Q | tr -d "\\012" >>file2 && cat file1 >file1.mods && cat file2 >file2.mods &&