tests/binfile.bin

vfs: use 'vfs' module directly in 'mercurial.simplemerge'

Now that the 'vfs' classes moved in their own module, lets use the new module
directly. We update code iteratively to help with possible bisect needs in the
future.

(binary:application/octet-stream)