mergetools / gvimdiff2on commit Merge branch 'kf/gpg-sig-verification-doc' into maint (968004c)
   1. "$MERGE_TOOLS_DIR/vimdiff"