mergetools / vimdiff2on commit Merge branch 'jz/gitweb-conf-doc-fix' (03571fd)
   1. "$MERGE_TOOLS_DIR/vimdiff"