Merged from the latest developing branch.
[MacVim/jjgod.git] / merge2.sh
blobcb149df2219301a1bd1798a588e30f93e883e5f2
1 #!/bin/sh
3 svn merge \
4 https://vim.svn.sourceforge.net/svnroot/vim/trunk/ \
5 https://vim.svn.sourceforge.net/svnroot/vim/branches/vim7.1 \