mergetools / gvimdiff2on commit Merge branch 'tz/asciidoctor-fixes' (ec8fcc7)
   1. "$MERGE_TOOLS_DIR/vimdiff"