mergetools / vimdiff2on commit Merge branch 'tb/connect-ipv6-parse-fix' into maint (ad34ad6)
   1. "$MERGE_TOOLS_DIR/vimdiff"