Merge branch 'py/git-gui-has-maintainer'
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"