comparison mercurial/mergeutil.py @ 35899:d5457d94e1c9

py3: replace "if ispy3" by pycompat.sysbytes() or util.forcebytestr()
author Yuya Nishihara <yuya@tcha.org>
date Sat, 27 Jan 2018 13:14:06 +0900
parents c1149533676b
children 2372284d9457
comparison
equal deleted inserted replaced
35898:a2b3b5c5a25a 35899:d5457d94e1c9