Merge branch 'mk/doc-pretty-fill'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"