diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-02-12 22:43:19 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-12 22:43:19 -0800 |
| commit | 2ef80c2d8998593852be2fb0546c8e4a518a6bf1 (patch) | |
| tree | 0907edcc74ec5fb9e1672aa3be963292778edd60 /t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_master | |
| parent | Merge branch 'nd/find-pack-entry-recent-cache-invalidation' (diff) | |
| parent | Use correct grammar in diffstat summary line (diff) | |
| download | tgif-2ef80c2d8998593852be2fb0546c8e4a518a6bf1.tar.xz | |
Merge branch 'nd/diffstat-gramnum'
* nd/diffstat-gramnum:
Use correct grammar in diffstat summary line
Diffstat (limited to 't/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_master')
| -rw-r--r-- | t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_master | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_master b/t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_master index df0aaa9f2c..48b0d4b91d 100644 --- a/t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_master +++ b/t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_master @@ -8,7 +8,7 @@ Date: Mon Jun 26 00:04:00 2006 +0000 dir/sub | 2 ++ file0 | 3 +++ - 2 files changed, 5 insertions(+), 0 deletions(-) + 2 files changed, 5 insertions(+) diff --cc dir/sub index cead32e,7289e35..992913c @@ -47,7 +47,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(+) create mode 100644 file3 diff --git a/dir/sub b/dir/sub @@ -89,7 +89,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(+) create mode 100644 file1 diff --git a/dir/sub b/dir/sub @@ -165,7 +165,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(+) create mode 100644 dir/sub create mode 100644 file0 create mode 100644 file2 |