mergetools / gvimdiff3on commit Merge branch 'ch/new-gpg-drops-rfc-1991' (3d4eecc)
   1. "$MERGE_TOOLS_DIR/vimdiff"