Mercurial > hg

comparison mercurial/merge.py @ 37663:fc114a16a484

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: use stringutil.forcebytestr() instead of str() We need to convert errors to bytes using stringutil.forcebytestr() Differential Revision: https://phab.mercurial-scm.org/D3324
author Pulkit Goyal <7895pulkit@gmail.com>
date Sat, 14 Apr 2018 01:59:55 +0530
parents daef13da66fe
children 7269b87f817c
comparison
equal deleted inserted replaced
37662:5340daa85c62 37663:fc114a16a484