mergetools / gvimdiff2on commit Merge branch 'sp/remote-curl-ssl-strerror' into maint (33b81b2)
   1. "$MERGE_TOOLS_DIR/vimdiff"