mergetools / gvimdiff3on commit Merge branch 'jk/asciidoc-markup-fix' into maint (96b7f93)
   1. "$MERGE_TOOLS_DIR/vimdiff"