Merge branch 'ch/new-gpg-drops-rfc-1991'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"