comparison mercurial/help/merge-tools.txt @ 38366:4a6d01b49d91

py3: convert error instances to bytes using pycompat.bytestr() Differential Revision: https://phab.mercurial-scm.org/D3788
author Pulkit Goyal <7895pulkit@gmail.com>
date Mon, 18 Jun 2018 15:28:18 +0530
parents ff178743e59b
children 7c6044634957
comparison
equal deleted inserted replaced
38365:bf953d218a91 38366:4a6d01b49d91