Merge branch 'kb/diff-blob-blob-doc'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"