Mercurial > hg

diff mercurial/filemerge.py @ 37741:700aaa19de63

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: fix up a couple of minor bytes inconsistencies in run-tests.py Only in the automatic bisection code, so fortunately nothing major is amiss. Fixes test-run-tests.t under Python 3. Differential Revision: https://phab.mercurial-scm.org/D3350
author Augie Fackler <augie@google.com>
date Fri, 13 Apr 2018 21:53:07 -0400
parents a8a902d7176e
children 242eb5132203
line wrap: on
line diff