mergetools / vimdiff2on commit Revert "Merge branch 'jc/graduate-remote-hg-bzr' (early part)" (b2c851a)
   1. "$MERGE_TOOLS_DIR/vimdiff"