Mercurial > hg-stable

diff tests/test-merge-criss-cross.t @ 38128:3de58f50afa2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: fix test-parseindex2 on Python 3 parsers.versionerrortext is a sysstr, but it's only ever used in this test on the Python side, so I'm okay to just handle it like this. Differential Revision: https://phab.mercurial-scm.org/D3622
author Augie Fackler <augie@google.com>
date Sat, 19 May 2018 15:53:31 -0400
parents 41ef02ba329b
children 52f19a840543
line wrap: on
line diff