Mercurial > hg

diff tests/failfilemerge.py @ 30109:96a2278ee732

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: use encoding.environ instead of os.environ This complains while running hg version on Python 3.5
author Pulkit Goyal <7895pulkit@gmail.com>
date Sun, 09 Oct 2016 12:37:10 +0200
parents a7f8939641aa
children 318a24b52eeb
line wrap: on
line diff