Mercurial > hg-stable

diff mercurial/simplemerge.py @ 31362:089e37802fb3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
parser: use %d instead of %s for interpolating error position Error position is an int, so we should use %d instead of %s. Fixes failures on Python 3.
author Augie Fackler <augie@google.com>
date Sun, 12 Mar 2017 00:44:59 -0500
parents 35284f933518
children c31d45623304
line wrap: on
line diff