diff --git a/tests/test-simplemerge.py b/tests/test-simplemerge.py --- a/tests/test-simplemerge.py +++ b/tests/test-simplemerge.py @@ -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):