diff mercurial/simplemerge.py @ 30615:bb77654dc7ae

py3: replace os.sep with pycompat.ossep (part 3 of 4)
author Pulkit Goyal <7895pulkit@gmail.com>
date Sat, 17 Dec 2016 20:14:24 +0530
parents 318a24b52eeb
children 21fa3d3688f3
line wrap: on
line diff