Merge branch 'wk/doc-clarify-upstream'
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"