Mercurial > hg
diff mercurial/mergeutil.py @ 36454:698fe0f6eb5c
py3: use pycompat.strurl to convert url to str
Differential Revision: https://phab.mercurial-scm.org/D2474
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Tue, 27 Feb 2018 00:43:37 +0530 |
parents | c1149533676b |
children | 2372284d9457 |