Merge branch 'js/mingw-loosen-overstrict-tree-entry-checks'
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"