repo.or.cz
/
git
/
kirr.git
/
blob
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
blame
|
history
|
raw
|
HEAD
Merge branch 'ao/send-email-irt'
[git/kirr.git]
/
t
/
t4013
/
diff.diff_master_master^_side
blob
50ec9cadd618e9d7f675a50a2bd30c3e3d0088f1
1
$ git diff master master^ side
2
diff --cc dir/sub
3
index cead32e,7289e35..992913c
4
--- a/dir/sub
5
+++ b/dir/sub
6
@@@ -1,6 -1,4 +1,8 @@@
7
A
8
B
9
+C
10
+D
11
+E
12
+F
13
+ 1
14
+ 2
15
diff --cc file0
16
index b414108,f4615da..10a8a9f
17
--- a/file0
18
+++ b/file0
19
@@@ -1,6 -1,6 +1,9 @@@
20
1
21
2
22
3
23
+4
24
+5
25
+6
26
+ A
27
+ B
28
+ C
29
$