summaryrefslogtreecommitdiff
path: root/t/t4100/t-apply-9.expect
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2012-02-01 12:55:07 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-02-04 07:19:42 (GMT)
commit7f814632f5d4d7af9f4225ece6039dbc44e03079 (patch)
tree67351306175c9ccb96af4bb5456e04ddef0787d1 /t/t4100/t-apply-9.expect
parent828ea97de486c1693d6e4f2c7347acb50235a85d (diff)
downloadgit-7f814632f5d4d7af9f4225ece6039dbc44e03079.zip
git-7f814632f5d4d7af9f4225ece6039dbc44e03079.tar.gz
git-7f814632f5d4d7af9f4225ece6039dbc44e03079.tar.bz2
Use correct grammar in diffstat summary line
"git diff --stat" and "git apply --stat" now learn to print the line "%d files changed, %d insertions(+), %d deletions(-)" in singular form whenever applicable. "0 insertions" and "0 deletions" are also omitted unless they are both zero. This matches how versions of "diffstat" that are not prehistoric produced their output, and also makes this line translatable. [jc: with help from Thomas Dickey in archaeology of "diffstat"] [jc: squashed Jonathan's updates to illustrations in tutorials and a test] Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4100/t-apply-9.expect')
-rw-r--r--t/t4100/t-apply-9.expect2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4100/t-apply-9.expect b/t/t4100/t-apply-9.expect
index eef7f2e..55a55c3 100644
--- a/t/t4100/t-apply-9.expect
+++ b/t/t4100/t-apply-9.expect
@@ -1,2 +1,2 @@
t/t4100-apply-stat.sh | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)