Mercurial > hg
comparison mercurial/copies.py @ 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 | ee7b6fa52d9d |
children | b5891bf8ab13 |
comparison
equal
deleted
inserted
replaced
38644:43d0619cec90 | 38645:02850baddadd |
---|