mergetools / gvimdiff3on commit Merge branch 'tc/curl-with-backports' (6ea13d8)
   1. "$MERGE_TOOLS_DIR/vimdiff"