mergetools / gvimdiff3on commit Merge branch 'bc/asciidoc-pretty-formats-fix' into maint (27c31d2)
   1. "$MERGE_TOOLS_DIR/vimdiff"