Merge branch 'sh/mingw-safer-compat-poll'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"