[thirdparty/git.git] / t / t4013 / diff.diff-tree_--cc_master

$ git diff-tree --cc master
59d314ad6f356dd08601a4cd5e530381da3e3c64
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
$
Commit	Line	Data
3c2f75b5	1	$ git diff-tree --cc master
a40d384c	2	59d314ad6f356dd08601a4cd5e530381da3e3c64
3c2f75b5 JH	3	diff --cc dir/sub
	4	index cead32e,7289e35..992913c
	5	--- a/dir/sub
	6	+++ b/dir/sub
	7	@@@ -1,6 -1,4 +1,8 @@@
	8	A
	9	B
	10	+C
	11	+D
	12	+E
	13	+F
	14	+ 1
	15	+ 2
	16	diff --cc file0
	17	index b414108,f4615da..10a8a9f
	18	--- a/file0
	19	+++ b/file0
	20	@@@ -1,6 -1,6 +1,9 @@@
	21	1
	22	2
	23	3
	24	+4
	25	+5
	26	+6
	27	+ A
	28	+ B
	29	+ C
	30	$