From: Johannes Schindelin <Johannes.Schindelin@xxxxxx> Elias Pipping: > I'm on a mac, hence /usr/bin/sed is not gnu sed, which makes > t4118 fail. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@xxxxxx> Ack'd-by: Elias Pipping <pipping@xxxxxxxxxxxx> --- t/t4118-apply-empty-context.sh | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/t/t4118-apply-empty-context.sh b/t/t4118-apply-empty- context.sh index 690a182..27cc6f2 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.orig >file1 && - sed -e "/^B/d" <file2.orig >file2 && + sed -e "/^[BQ]/d" <file2.orig >file2 && + echo Q | tr -d "\\012" >>file2 && cat file1 >file1.mods && cat file2 >file2.mods && git diff | -- Shawn. - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html