comparison mercurial/mergeutil.py @ 31324:e712a9c35fd8

repair: directly use repo.vfs.join The 'repo.join' method is about to be deprecated.
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Wed, 08 Mar 2017 16:53:39 -0800
parents c1149533676b
children 2372284d9457
comparison
equal deleted inserted replaced
31323:102d3a30582c 31324:e712a9c35fd8