mergetools / vimdiff2on commit Merge branch 'ch/new-gpg-drops-rfc-1991' into maint (ab09f58)
   1. "$MERGE_TOOLS_DIR/vimdiff"