Renamed nice_svn_merge to svn_rebase, as that is what it does effectively.