Patchwork D3897: tests: prevent conflict markers in test case from triggering warnings

login
register
mail settings
Submitter phabricator
Date July 11, 2018, 11:26 a.m.
Message ID <a6fbdfee8939f408fbc9c5e5664d6232@localhost.localdomain>
Download mbox | patch
Permalink /patch/32768/
State Not Applicable
Headers show

Comments

phabricator - July 11, 2018, 11:26 a.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG02850baddadd: tests: prevent conflict markers in test case from triggering warnings (authored by hooper, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D3897?vs=9485&id=9530

REVISION DETAIL
  https://phab.mercurial-scm.org/D3897

AFFECTED FILES
  tests/test-simplemerge.py

CHANGE DETAILS




To: hooper, #hg-reviewers
Cc: mercurial-devel

Patch

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):