Mercurial > public > mercurial-scm > hg

diff mercurial/merge.py @ 30073:aa23c93e636d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: make format strings unicodes and not bytes Fixes issues on Python 3, wherein docstrings are unicodes. Shouldn't break anything on Python 2.
author Pulkit Goyal <7895pulkit@gmail.com>
date Sat, 08 Oct 2016 16:10:58 +0200
parents a145161debed
children 98d3d8108db0
line wrap: on
line diff