alias s=$'svn status -q | grep -e \'^[ ]*M\' | less'
svn merge -v -r 2780:2635 .
svn diff > xy.patch; svn revert -R
and restore:
patch -p0 < xy.patch
svn diff
git stash