Nested Trees (was Re: bzr 1.17rc1 released!)

[Patrick van der Velde]

Hiya

Eh do I have to do anything for the merge? I've had a crack at reading
through the merged document but it's hard to read with all the merge
markers in there. And I'm not sure how to merge it in a repro on my
drive. I've tried getting the old documents from the server using bzr
but I'm on a windows machine at the moment and I don't have an ssh
port setup (it's my work machine) so I've only got a downloaded copy
of the document.