mergetools / gvimdiff2on commit Merge branch 'sh/asciidoc-git-version-fix' (ab9432d)
   1. "$MERGE_TOOLS_DIR/vimdiff"