Merge branch 'ml/cygwin-does-not-have-fifo'
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"