Merge branch 'rj/no-xopen-source-for-cygwin' into maint
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"