Merge branch 'bc/asciidoc-pretty-formats-fix' into maint
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"