diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-02-21 14:56:39 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-21 14:56:39 -0800 |
| commit | 093b194cc5570c825173a90538a4c212bc64bc7f (patch) | |
| tree | b6557708089548b930b8009e9639a0e4f98c9efa /t/t4030-diff-textconv.sh | |
| parent | f3ccea8dd4ba03c8ed1971c317a14c1c34b61705 (diff) | |
| parent | 7f814632f5d4d7af9f4225ece6039dbc44e03079 (diff) | |
| download | git-093b194cc5570c825173a90538a4c212bc64bc7f.tar.gz | |
Merge branch 'nd/diffstat-gramnum' into maint
* nd/diffstat-gramnum:
Use correct grammar in diffstat summary line
Diffstat (limited to 't/t4030-diff-textconv.sh')
| -rwxr-xr-x | t/t4030-diff-textconv.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4030-diff-textconv.sh b/t/t4030-diff-textconv.sh index 88c5619ae7..4ac162cfcf 100755 --- a/t/t4030-diff-textconv.sh +++ b/t/t4030-diff-textconv.sh @@ -86,7 +86,7 @@ test_expect_success 'status -v produces text' ' cat >expect.stat <<'EOF' file | Bin 2 -> 4 bytes - 1 files changed, 0 insertions(+), 0 deletions(-) + 1 file changed, 0 insertions(+), 0 deletions(-) EOF test_expect_success 'diffstat does not run textconv' ' echo file diff=fail >.gitattributes && |