Merge branch 'jk/big-and-future-archive-tar'

diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
index 3159956fde89639354fe5ed4d3cdf083a2cbbb0f..37ebbcfbbf0fd7815f598cf54d9c2c2825341f41 100755 (executable)
--- a/t/t5520-pull.sh
+++ b/t/t5520-pull.sh
@@ -211,7 +211,7 @@ test_expect_success 'fail if the index has unresolved entries' '
        test -n "$(git ls-files -u)" &&
        cp file expected &&
        test_must_fail git pull . second 2>err &&
-       test_i18ngrep "Pull is not possible because you have unmerged files" err &&
+       test_i18ngrep "Pulling is not possible because you have unmerged files." err &&
        test_cmp expected file &&
        git add file &&
        test -z "$(git ls-files -u)" &&