2009/3/23 Antoine Pitrou firstname.lastname@example.org:
Guilherme Polo <ggpolo <at> gmail.com> writes:
Any chance you were not using the latest svnmerge when you did that merge ? I've had problems like this when using older versions.
Well, actually, Benjamin did the merge, so perhaps he can give more info.
I was using the latest svnmerge.py from the SVN trunk. (maybe it's broken?)