git/t/t4013/diff.show_master

$ git show master
commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
Merge: 9a6d494 c7a2ab9
Author: A U Thor <[email protected]>
Date:   Mon Jun 26 00:04:00 2006 +0000

    Merge branch 'side'

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
$