Merge branch 'tt/no-ipv6-fallback-for-winxp'
[git] / mergetools / gvimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"