Merge branch 'sh/asciidoc-git-version-fix'
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"