Merge branch 'sp/remote-curl-ssl-strerror'
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"