Mercurial > hg

diff mercurial/merge.py @ 36374:f0c94af0d70d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: add b'' prefixes in test-dispatch.py # skip-blame because this is just adding b'' prefixes
author Pulkit Goyal <7895pulkit@gmail.com>
date Wed, 21 Feb 2018 23:43:23 +0530
parents 759579bac31d
children 035b77bf01d2
line wrap: on
line diff