D3897: tests: prevent conflict markers in test case from triggering warnings
hooper (Danny Hooper)
phabricator at mercurial-scm.org
Wed Jul 11 07:26:20 EDT 2018
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
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):
To: hooper, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list