1$ git show master
2commit 176b998f5d647cbd77a9d8acf4531e930754d16d
3Merge: 889b315... c7a2ab9...
4Author: A U Thor <author@example.com>
5Date: Mon Jun 26 00:04:00 2006 +0000
67
Merge branch 'side'
89
diff --cc dir/sub
10index cead32e,7289e35..992913c
11--- a/dir/sub
12+++ b/dir/sub
13@@@ -1,6 -1,4 +1,8 @@@
14A
15B
16+C
17+D
18+E
19+F
20+ 1
21+ 2
22diff --cc file0
23index b414108,f4615da..10a8a9f
24--- a/file0
25+++ b/file0
26@@@ -1,6 -1,6 +1,9 @@@
271
282
293
30+4
31+5
32+6
33+ A
34+ B
35+ C
36$