Mercurial > hg

diff mercurial/merge.py @ 32130:c3dcec6cbc1b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: use %d instead of %s for integers dispatch._runcatch() always returns an integer value.
author Pulkit Goyal <7895pulkit@gmail.com>
date Fri, 21 Apr 2017 01:13:18 +0530
parents e960eba3581c
children 4d504e541d3d
line wrap: on
line diff