Merge branch 'js/mingw-spawn-with-spaces-in-path' into maint
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"