mergetools / gvimdiff2on commit Merge branch 'jc/http-sslkey-and-ssl-cert-are-paths' into maint (72140a7)
   1. "$MERGE_TOOLS_DIR/vimdiff"