repo.or.cz
/
git
/
dscho.git
/
blob
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
blame
|
history
|
raw
|
HEAD
Sync with 1.7.0 series
[git/dscho.git]
/
t
/
t4013
/
diff.show_master
blob
fb08ce0e46d16d223269754295cc4a8dc4364268
1
$ git show master
2
commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
3
Merge: 9a6d494 c7a2ab9
4
Author: A U Thor <author@example.com>
5
Date: Mon Jun 26 00:04:00 2006 +0000
6
7
Merge branch 'side'
8
9
diff --cc dir/sub
10
index cead32e,7289e35..992913c
11
--- a/dir/sub
12
+++ b/dir/sub
13
@@@ -1,6 -1,4 +1,8 @@@
14
A
15
B
16
+C
17
+D
18
+E
19
+F
20
+ 1
21
+ 2
22
diff --cc file0
23
index b414108,f4615da..10a8a9f
24
--- a/file0
25
+++ b/file0
26
@@@ -1,6 -1,6 +1,9 @@@
27
1
28
2
29
3
30
+4
31
+5
32
+6
33
+ A
34
+ B
35
+ C
36
$