comparison mercurial/merge.py @ 30612:d623cc6b3742

py3: replace os.pathsep with pycompat.ospathsep os.pathsep returns unicode on Python 3. We already have pycompat.ospathsep which return bytes on Python 3. This patch replaces all the occurrences of os.pathsep in the codebase (excluding tests) to pycompat.ospathsep.
author Pulkit Goyal <7895pulkit@gmail.com>
date Sat, 17 Dec 2016 19:47:17 +0530
parents 43a9e02a7b7f
children 41f6af50c0d8
comparison
equal deleted inserted replaced
30611:cbc61b1b52ea 30612:d623cc6b3742