log mercurial/simplemerge.py @ 31267:11831d755b51

age author description
Thu, 02 Mar 2017 13:30:58 +0100 Pierre-Yves David vfs: use 'vfs' module directly in 'mercurial.simplemerge'