Merge branch 'pb/doc-external-diff-env'
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"