mergetools / gvimdiff2on commit Merge branch 'bc/asciidoc-pretty-formats-fix' (337233c)
   1. "$MERGE_TOOLS_DIR/vimdiff"