OSDN Git Service
(root)
/
vbslib
/
main.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Version 5.91
[vbslib/main.git]
/
_src
/
Test
/
tools
/
T_Diff
/
Files
/
Conflict
/
T2_DiffOfBaseLeft.txt
diff --git a/_src/Test/tools/T_Diff/Files/Conflict/T2_DiffOfBaseLeft.txt
b/_src/Test/tools/T_Diff/Files/Conflict/T2_DiffOfBaseLeft.txt
new file mode 100644
(file)
index 0000000..
1cc4111
--- /dev/null
+++ b/
_src/Test/tools/T_Diff/Files/Conflict/T2_DiffOfBaseLeft.txt
@@ -0,0
+1,6
@@
+AddAtLast
\r
+1
\r
+<<<<<<< Conflict\T2_Base.txt
\r
+=======
\r
+Left
\r
+>>>>>>> Conflict\T2_Left.txt
\r