Mercurial > hg
view mercurial/templates/raw/index.tmpl @ 42151:7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
We were using `true` as merge tool. I think it makes the test easier
to understand if we make the conflicts explcit. It also papered over a
conflict that shouldn't have been a conflict (just a bug in copy
tracing). I've marked that "BROKEN".
Differential Revision: https://phab.mercurial-scm.org/D6252
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Sun, 14 Apr 2019 13:46:40 -0700 |
parents | f91e5630ce7e |
children |