Jacob Kaplan-Moss

Svnmerge.py - SubversionWiki

Part of SVN 1.4, this looks like a *much* more sane way of handling branches. Must investigate further…

(merge, scm, svn, tools)