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/t4013/diff.format-patch_--stdout_initial..master | |
parent | f3ccea8dd4ba03c8ed1971c317a14c1c34b61705 (diff) | |
parent | 7f814632f5d4d7af9f4225ece6039dbc44e03079 (diff) | |
download | git-093b194cc5570c825173a90538a4c212bc64bc7f.tar.gz git-093b194cc5570c825173a90538a4c212bc64bc7f.tar.xz |
Merge branch 'nd/diffstat-gramnum' into maint
* nd/diffstat-gramnum:
Use correct grammar in diffstat summary line
Diffstat (limited to 't/t4013/diff.format-patch_--stdout_initial..master')
-rw-r--r-- | t/t4013/diff.format-patch_--stdout_initial..master | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t4013/diff.format-patch_--stdout_initial..master b/t/t4013/diff.format-patch_--stdout_initial..master index 7b89978e3..a3dab7f77 100644 --- a/t/t4013/diff.format-patch_--stdout_initial..master +++ b/t/t4013/diff.format-patch_--stdout_initial..master @@ -53,7 +53,7 @@ Subject: [PATCH 2/3] Third --- dir/sub | 2 ++ file1 | 3 +++ - 2 files changed, 5 insertions(+), 0 deletions(-) + 2 files changed, 5 insertions(+) create mode 100644 file1 diff --git a/dir/sub b/dir/sub @@ -88,7 +88,7 @@ Subject: [PATCH 3/3] Side dir/sub | 2 ++ file0 | 3 +++ file3 | 4 ++++ - 3 files changed, 9 insertions(+), 0 deletions(-) + 3 files changed, 9 insertions(+) create mode 100644 file3 diff --git a/dir/sub b/dir/sub |