mergetools / gvimdiffon commit Merge branch 'bc/submitting-patches-in-asciidoc' into maint (3cdea38)
   1. "$MERGE_TOOLS_DIR/vimdiff"