Mercurial > hg > mercurial-source

diff mercurial/context.py @ 42938:7116fc614cfc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 5382d8f8530b
children 14589f1989e9
line wrap: on
line diff