mergetools / vimdiff2on commit Merge branch 'jh/msvc' (88b1075)
   1. "$MERGE_TOOLS_DIR/vimdiff"