Merge branch 'sg/complete-decorate-full-not-long' into maint

[git] / t / t4013 / diff.diff-tree_--cc_--patch-with-stat_master

$ git diff-tree --cc --patch-with-stat master
59d314ad6f356dd08601a4cd5e530381da3e3c64
 dir/sub | 2 ++
 file0   | 3 +++
 2 files changed, 5 insertions(+)

diff --cc dir/sub
index cead32e,7289e35..992913c
--- a/dir/sub
+++ b/dir/sub
@@@ -1,6 -1,4 +1,8 @@@
  A
  B
 +C
 +D
 +E
 +F
+ 1
+ 2
diff --cc file0
index b414108,f4615da..10a8a9f
--- a/file0
+++ b/file0
@@@ -1,6 -1,6 +1,9 @@@
  1
  2
  3
 +4
 +5
 +6
+ A
+ B
+ C
$