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