Merge branch 'et/win32-poll-timeout'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"