Merge branch 'bc/do-not-recurse-in-die'

diff --git a/t/t4049-diff-stat-count.sh b/t/t4049-diff-stat-count.sh
index b41eb61ca8b1e66f618d480a28b2bc14815df2f7..7b3ef00533f7b2fc5f8cea7b9d3553365ac69d0c 100755 (executable)
--- a/t/t4049-diff-stat-count.sh
+++ b/t/t4049-diff-stat-count.sh
@@ -16,7 +16,8 @@ test_expect_success setup '
        cat >expect <<-\EOF
         a | 1 +
         b | 1 +
-        2 files changed, 2 insertions(+)
+        ...
+        4 files changed, 2 insertions(+)
        EOF
        git diff --stat --stat-count=2 >actual &&
        test_i18ncmp expect actual