mergetools / vimdiff3on commit Merge branch 'rm/gitweb-start-form' into maint (af1b4e3)
   1. "$MERGE_TOOLS_DIR/vimdiff"