Merge branch 'bc/gpg-sign-everywhere'
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"