summaryrefslogtreecommitdiff
path: root/t/t4013/diff.diff-tree_--cc_--patch-with-stat_master
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-05-02 13:53:28 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-05-02 13:53:28 -0700
commit29c2a3dbadaa1c2d1128a4892241f82f5b34778c (patch)
treee89235283655640030f481b6c8f5b6af77535650 /t/t4013/diff.diff-tree_--cc_--patch-with-stat_master
parentMerge branch 'pw/p4-various' (diff)
parentdiff --stat: use less columns for change counts (diff)
downloadtgif-29c2a3dbadaa1c2d1128a4892241f82f5b34778c.tar.xz
Merge branch 'zj/diff-stat-smaller-num-columns'
Spend only minimum number of columns necessary to show the number of lines in the output from "diff --stat", instead of always allocating 4 columns even when showing changes that are much smaller than 1000 lines. By Zbigniew Jędrzejewski-Szmek * zj/diff-stat-smaller-num-columns: diff --stat: use less columns for change counts
Diffstat (limited to 't/t4013/diff.diff-tree_--cc_--patch-with-stat_master')
-rw-r--r--t/t4013/diff.diff-tree_--cc_--patch-with-stat_master4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t4013/diff.diff-tree_--cc_--patch-with-stat_master b/t/t4013/diff.diff-tree_--cc_--patch-with-stat_master
index 8b357d964b..db3c0a7b2c 100644
--- a/t/t4013/diff.diff-tree_--cc_--patch-with-stat_master
+++ b/t/t4013/diff.diff-tree_--cc_--patch-with-stat_master
@@ -1,7 +1,7 @@
$ git diff-tree --cc --patch-with-stat master
59d314ad6f356dd08601a4cd5e530381da3e3c64
- dir/sub | 2 ++
- file0 | 3 +++
+ dir/sub | 2 ++
+ file0 | 3 +++
2 files changed, 5 insertions(+)
diff --cc dir/sub