Show More
@@ -109,13 +109,13 b' MERGED_RESULT = split_lines(b"""\\' | |||||
109 | so we may see their result. |
|
109 | so we may see their result. | |
110 | The two are the same, |
|
110 | The two are the same, | |
111 | But after they are produced, |
|
111 | But after they are produced, | |
112 | they have different names. |
|
112 | they have different names.\ | |
113 | <<<<<<< LAO |
|
113 | \n<<<<<<< LAO\ | |
114 | ======= |
|
114 | \n======= | |
115 |
|
115 | |||
116 | -- The Way of Lao-Tzu, tr. Wing-tsit Chan |
|
116 | -- The Way of Lao-Tzu, tr. Wing-tsit Chan | |
117 |
|
117 | \ | ||
118 | >>>>>>> TAO |
|
118 | \n>>>>>>> TAO | |
119 | """) |
|
119 | """) | |
120 |
|
120 | |||
121 | class TestMerge3(TestCase): |
|
121 | class TestMerge3(TestCase): |
General Comments 0
You need to be logged in to leave comments.
Login now