> > > One conflict option that's not done yet is one that merges a textual change > from a path ^/trunk/B to a path ^/branch/A, after a move A -> B on trunk. > I don't consider this a release blocker. We can always add this option in > a patch release. > > Is that a regression versus v1.9 and before?
- Paul
