mergetools / vimdiff3on commit Merge branch 'jz/gitweb-conf-doc-fix' into maint (1c30f8e)
   1. "$MERGE_TOOLS_DIR/vimdiff"