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