Merge branch 'jk/gpg-interface-cleanup'
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"