mergetools / vimdiff2on commit Sync with 1.8.1.3 (c86223b)
   1. "$MERGE_TOOLS_DIR/vimdiff"