Mercurial > hg
diff tests/test-rename-merge1.t @ 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 | d4e62df1c73d |
children | 3a7efcbdf288 |