changeset 38645 | 02850baddadd |
parent 37892 | c1bc196e021d |
child 43010 | d75142ef054a |
--- a/tests/test-simplemerge.py Tue Jul 10 12:20:57 2018 +0200 +++ b/tests/test-simplemerge.py Mon Jul 09 15:33:49 2018 -0700 @@ -109,13 +109,13 @@ so we may see their result. The two are the same, But after they are produced, - they have different names. -<<<<<<< LAO -======= + they have different names.\ +\n<<<<<<< LAO\ +\n======= -- The Way of Lao-Tzu, tr. Wing-tsit Chan - ->>>>>>> TAO +\ +\n>>>>>>> TAO """) class TestMerge3(TestCase):