mergetools / vimdiff2on commit Sync with 1.8.1.5 (06d67b8)
   1. "$MERGE_TOOLS_DIR/vimdiff"