Merge branch 'cc/mailmap-tuxfamily'

diff --git a/t/t4153-am-resume-override-opts.sh b/t/t4153-am-resume-override-opts.sh
index 7c013d84d5978edf3760c48e0125c3527c8e09f9..8ea22d1bcbb8340d32fe87f299a77c98362c3797 100755 (executable)
--- a/t/t4153-am-resume-override-opts.sh
+++ b/t/t4153-am-resume-override-opts.sh
@@ -53,7 +53,7 @@ test_expect_success '--no-quiet overrides --quiet' '
        # Applying side1 will be quiet.
        test_must_fail git am --quiet side[123].eml >out &&
        test_path_is_dir .git/rebase-apply &&
-       ! test_i18ngrep "^Applying: " out &&
+       test_i18ngrep ! "^Applying: " out &&
        echo side1 >file &&
        git add file &&