mergetools / gvimdiff3on commit Merge branch 'jk/skip-http-tests-under-no-curl' into maint (c538004)
   1. "$MERGE_TOOLS_DIR/vimdiff"