OSDN Git Service
(root)
/
vbslib
/
main.git
/ blob
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
history
|
raw
|
HEAD
Version 5.91
[vbslib/main.git]
/
_src
/
Test
/
tools
/
T_Diff
/
_LeftOut.txt
1
Add
\r
2
1
\r
3
AddLeft
\r
4
2
\r
5
Left
\r
6
4
\r
7
<<<<<<< Left.txt
\r
8
=======
\r
9
AddRight
\r
10
>>>>>>> Right.txt
\r
11
5
\r
12
AddBoth
\r
13
6
\r
14
<<<<<<< Left.txt
\r
15
AddBothLeft
\r
16
||||||| RightBase.txt
\r
17
=======
\r
18
AddBothRight
\r
19
>>>>>>> Right.txt
\r
20
7
\r
21
Left
\r
22
8
\r
23
9
\r
24
\r
25
Modify
\r
26
1
\r
27
ModifyLeft
\r
28
3
\r
29
<<<<<<< Left.txt
\r
30
Left
\r
31
||||||| RightBase.txt
\r
32
4
\r
33
=======
\r
34
Right
\r
35
>>>>>>> Right.txt
\r
36
5
\r
37
<<<<<<< Left.txt
\r
38
6
\r
39
=======
\r
40
ModifyRight
\r
41
>>>>>>> Right.txt
\r
42
7
\r
43
ModifyBoth
\r
44
9
\r
45
<<<<<<< Left.txt
\r
46
ModifyBothLeft
\r
47
||||||| RightBase.txt
\r
48
A
\r
49
=======
\r
50
ModifyBothRight
\r
51
>>>>>>> Right.txt
\r
52
B
\r
53
\r
54
Delete
\r
55
1
\r
56
3
\r
57
Left
\r
58
5
\r
59
<<<<<<< Left.txt
\r
60
6
\r
61
||||||| RightBase.txt
\r
62
DeleteRight
\r
63
=======
\r
64
>>>>>>> Right.txt
\r
65
7
\r
66
9
\r