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.log_--root_--patch-with-stat_master | |
parent | Merge branch 'nd/find-pack-entry-recent-cache-invalidation' into maint (diff) | |
parent | Use correct grammar in diffstat summary line (diff) | |
download | tgif-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.log_--root_--patch-with-stat_master')
-rw-r--r-- | t/t4013/diff.log_--root_--patch-with-stat_master | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t4013/diff.log_--root_--patch-with-stat_master b/t/t4013/diff.log_--root_--patch-with-stat_master index 5f0c98f9ce..0807ece234 100644 --- a/t/t4013/diff.log_--root_--patch-with-stat_master +++ b/t/t4013/diff.log_--root_--patch-with-stat_master @@ -15,7 +15,7 @@ Date: Mon Jun 26 00:03:00 2006 +0000 dir/sub | 2 ++ file0 | 3 +++ file3 | 4 ++++ - 3 files changed, 9 insertions(+), 0 deletions(-) + 3 files changed, 9 insertions(+) diff --git a/dir/sub b/dir/sub index 35d242b..7289e35 100644 @@ -56,7 +56,7 @@ Date: Mon Jun 26 00:02:00 2006 +0000 --- dir/sub | 2 ++ file1 | 3 +++ - 2 files changed, 5 insertions(+), 0 deletions(-) + 2 files changed, 5 insertions(+) diff --git a/dir/sub b/dir/sub index 8422d40..cead32e 100644 @@ -130,7 +130,7 @@ Date: Mon Jun 26 00:00:00 2006 +0000 dir/sub | 2 ++ file0 | 3 +++ file2 | 3 +++ - 3 files changed, 8 insertions(+), 0 deletions(-) + 3 files changed, 8 insertions(+) diff --git a/dir/sub b/dir/sub new file mode 100644 |