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
/
Files
/
UnifiedDiff.txt
1
--- Conflict\Base.txt 2015-08-30 18:25:31.144552800 +0900
\r
2
+++ Conflict\Left.txt 2015-08-30 18:25:21.612743800 +0900
\r
3
@@ -2,7 +2,14 @@
\r
4
1
\r
5
+LLL
\r
6
2
\r
7
3
\r
8
+Both
\r
9
4
\r
10
+LLL
\r
11
5
\r
12
+Both
\r
13
+LLL
\r
14
6
\r
15
+Unique B
\r
16
+Unique C
\r
17
\r
18
@@ -10,3 +17,3 @@
\r
19
1
\r
20
-2
\r
21
+LLL
\r
22
3
\r
23
@@ -14,8 +21,8 @@
\r
24
5
\r
25
-6
\r
26
+Both
\r
27
7
\r
28
-8
\r
29
-9
\r
30
+Both
\r
31
+LLL
\r
32
10
\r
33
-Single A
\r
34
+Single B
\r
35
\r
36
@@ -23,3 +30,2 @@
\r
37
1
\r
38
-LLL
\r
39
2
\r
40
@@ -27,8 +33,4 @@
\r
41
3
\r
42
-Both
\r
43
4
\r
44
-Both
\r
45
-LLL
\r
46
5
\r
47
-Both
\r
48
RRR
\r
49
@@ -37,8 +39,9 @@
\r
50
\82
P
\r
51
+
\8d
¶
\82
É
\92
Ç
\89
Á
\r
52
\82
Q
\r
53
\82
R
\r
54
+
\97
¼
\95
û
\92
Ç
\89
Á
\r
55
\82
S
\r
56
+
\97
¼
\95
û
\95
Ï
\8d
X
\81
i
\8d
¶
\81
j
\r
57
-
\82
T
\r
58
\82
U
\r
59
-
\82
V
\r
60
\82
W
\r