Merge branch 'cn/deprecate-ssh-git-url'
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"