]> git.ipfire.org Git - thirdparty/git.git/blob - t/t4013/diff.diff-tree_--cc_--patch-with-stat_master
Merge branch 'sb/hex-object-name-is-at-most-41-bytes-long' into maint
[thirdparty/git.git] / t / t4013 / diff.diff-tree_--cc_--patch-with-stat_master
1 $ git diff-tree --cc --patch-with-stat master
2 59d314ad6f356dd08601a4cd5e530381da3e3c64
3 dir/sub | 2 ++
4 file0 | 3 +++
5 2 files changed, 5 insertions(+)
6
7 diff --cc dir/sub
8 index cead32e,7289e35..992913c
9 --- a/dir/sub
10 +++ b/dir/sub
11 @@@ -1,6 -1,4 +1,8 @@@
12 A
13 B
14 +C
15 +D
16 +E
17 +F
18 + 1
19 + 2
20 diff --cc file0
21 index b414108,f4615da..10a8a9f
22 --- a/file0
23 +++ b/file0
24 @@@ -1,6 -1,6 +1,9 @@@
25 1
26 2
27 3
28 +4
29 +5
30 +6
31 + A
32 + B
33 + C
34 $