# HG changeset patch
# User Danny Hooper <hooper@google.com>
# Date 2018-07-09 22:33:49
# Node ID 02850baddaddab29b5f5a0851b6cb1c9b0eeb3ec
# Parent  43d0619cec90d8c7a28d08880a345da98041606b

tests: prevent conflict markers in test case from triggering warnings

Broadly, having lines that begin with several '<' tends to trigger tools that
try to warn you about unresolved conflicts. It will save some headaches to
tweak this string literal to avoid that.

Differential Revision: https://phab.mercurial-scm.org/D3897

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 @@ MERGED_RESULT = split_lines(b"""\
        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):