Merge branch 'bc/submitting-patches-in-asciidoc' into maint
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"