mergetools / gvimdiffon commit Merge branch 'jn/gitweb-install-doc' into maint (40a9c3c)
   1. "$MERGE_TOOLS_DIR/vimdiff"