Mercurial > hg

diff tests/failfilemerge.py @ 42950:6fb281f39c25

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: pass a bytestring into querydrev instead of a string that'll TypeError This was a regression I introduced in c19d259fd6ad. When the string gets to the memoryview in _tokenize under py3 it'll die. Differential Revision: https://phab.mercurial-scm.org/D6869
author Ian Moody <moz-ian@perix.co.uk>
date Wed, 18 Sep 2019 00:20:43 +0100
parents c0ce60459d84
children 2372284d9457
line wrap: on
line diff