merge: make branch.<name>.mergeoptions correctly override merge.<option>

[git.git] / t / t7500-commit.sh

diff --git a/t/t7500-commit.sh b/t/t7500-commit.sh
index 8eec0fa9bc7278981b9a16571c588ede0a94d341..9f5c3edb0392c321092e56e2bf46fd096f74cf75 100755 (executable)
--- a/t/t7500-commit.sh
+++ b/t/t7500-commit.sh
@@ -150,7 +150,7 @@ EOF
 test_expect_success '--signoff' '
        echo "yet another content *narf*" >> foo &&
        echo "zort" | git commit -s -F - foo &&
-       git cat-file commit HEAD | sed "1,/^$/d" > output &&
+       git cat-file commit HEAD | sed "1,/^\$/d" > output &&
        test_cmp expect output
 '