mergetools / vimdiff2on commit Sync with maint (33f2c4f)
   1. "$MERGE_TOOLS_DIR/vimdiff"