Mercurial > hg

comparison tests/failfilemerge.py @ 38065:64280cd4b454

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: use pycompat.bytestr() to convert str into bytes the keys of opts are str here, so we have to convert it to bytes before passing into error.Abort() Differential Revision: https://phab.mercurial-scm.org/D3617
author Pulkit Goyal <7895pulkit@gmail.com>
date Sat, 19 May 2018 21:47:59 +0530
parents c0ce60459d84
children 2372284d9457
comparison
equal deleted inserted replaced
38064:46e8abc4eb04 38065:64280cd4b454