Mercurial > hg

diff mercurial/mergeutil.py @ 41345:24bef6a99958

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: fix up test-encoding-align.t for python3 I'm not super thrilled with how this reads, but the original didn't thrill me either. Differential Revision: https://phab.mercurial-scm.org/D5682
author Augie Fackler <augie@google.com>
date Thu, 24 Jan 2019 14:12:00 -0500
parents c1149533676b
children 2372284d9457
line wrap: on
line diff