mergetools / vimdiff2on commit Merge branch 'dn/gpg-doc' into maint (17eb7a7)
   1. "$MERGE_TOOLS_DIR/vimdiff"