mergetools / gvimdiff2on commit Merge branch 'rt/links-for-asciidoctor' (c923f60)
   1. "$MERGE_TOOLS_DIR/vimdiff"