From 3007a78033fec09b97ff1ca816a2d23c292dd956 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Thu, 22 Mar 2007 21:05:28 -0400 Subject: [PATCH] t4118: be nice to non-GNU sed Elias Pipping: > I'm on a mac, hence /usr/bin/sed is not gnu sed, which makes > t4118 fail. Signed-off-by: Johannes Schindelin Ack'd-by: Elias Pipping Signed-off-by: Junio C Hamano --- t/t4118-apply-empty-context.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 | -- 2.30.2