mergetools / gvimdiffon commit Merge branch 'ab/gitweb-link-html-escape' into maint (1dc4aa6)
   1. "$MERGE_TOOLS_DIR/vimdiff"