mergetools / gvimdiffon commit Merge branch 'bc/http-fallback-to-password-after-krb-fails' (1c4ebbc)
   1. "$MERGE_TOOLS_DIR/vimdiff"