Merge branch 'ks/doc-fixes'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"