From: David Abrahams (dave_at_[hidden])
Date: 2007-11-01 19:12:02
I hope everyone is using http://www.orcaware.com/svn/wiki/Svnmerge.py
when merging changes between branches and trunk. That's very
important if we're going to avoid merge hell.
-- Dave Abrahams Boost Consulting http://www.boost-consulting.com