mergetools / vimdiff2on commit Merge branch 'bc/http-fallback-to-password-after-krb-fails' into maint (8f3d03d)
   1. "$MERGE_TOOLS_DIR/vimdiff"