Merge branch 'bb/ssh-key-files' of git-gui into bb/git-gui-ssh-key-files
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"