mergetools / vimdiff2on commit Merge branch 'bc/http-keep-memory-given-to-curl' into maint (29b2f05)
   1. "$MERGE_TOOLS_DIR/vimdiff"