Mercurial > hg

diff mercurial/merge.py @ 30624:a82a6eee2613

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: have a bytes version of sys.platform sys.platform returns unicodes on Python 3. This patch adds up pycompat.sysplatform which returns bytes.
author Pulkit Goyal <7895pulkit@gmail.com>
date Sun, 18 Dec 2016 00:52:05 +0530
parents 43a9e02a7b7f
children 41f6af50c0d8
line wrap: on
line diff