mergetools / vimdiff3on commit Merge branch 'jk/asciidoctor-section-heading-markup-fix' into maint (aa8f64d)
   1. "$MERGE_TOOLS_DIR/vimdiff"