Mercurial > hg-stable
changeset 38645:02850baddadd
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
| author | Danny Hooper <hooper@google.com> |
|---|---|
| date | Mon, 09 Jul 2018 15:33:49 -0700 |
| parents | 43d0619cec90 |
| children | 93313f66b69b |
| files | tests/test-simplemerge.py |
| diffstat | 1 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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):