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.format-patch_--inline_--stdout_--subject-prefix=TESTCASE_initial..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.format-patch_--inline_--stdout_--subject-prefix=TESTCASE_initial..master')
-rw-r--r-- | t/t4013/diff.format-patch_--inline_--stdout_--subject-prefix=TESTCASE_initial..master | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t4013/diff.format-patch_--inline_--stdout_--subject-prefix=TESTCASE_initial..master b/t/t4013/diff.format-patch_--inline_--stdout_--subject-prefix=TESTCASE_initial..master index ca3f60bf0e..b4fd66477a 100644 --- a/t/t4013/diff.format-patch_--inline_--stdout_--subject-prefix=TESTCASE_initial..master +++ b/t/t4013/diff.format-patch_--inline_--stdout_--subject-prefix=TESTCASE_initial..master @@ -75,7 +75,7 @@ Content-Transfer-Encoding: 8bit --- dir/sub | 2 ++ file1 | 3 +++ - 2 files changed, 5 insertions(+), 0 deletions(-) + 2 files changed, 5 insertions(+) create mode 100644 file1 @@ -124,7 +124,7 @@ Content-Transfer-Encoding: 8bit dir/sub | 2 ++ file0 | 3 +++ file3 | 4 ++++ - 3 files changed, 9 insertions(+), 0 deletions(-) + 3 files changed, 9 insertions(+) create mode 100644 file3 |