mergetools / gvimdiffon commit remote-hg: tests: fix hg merge (0c27c12)
   1. "$MERGE_TOOLS_DIR/vimdiff"