Merge branch 'jz/gitweb-conf-doc-fix'
[git] / mergetools / gvimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"