[MERGE] documentation from the london sprint

[Robert Collins]

On Sun, 2007-06-03 at 23:55 -0400, Aaron Bentley wrote:
> 
> I was just kibbitzing on your notes.  They are fine as is, but can
> inspire further discussion. 

Cool. I've added a trivial note to doc/developers/merge-scaling.rst:

Notes
=====
Multiparent deltas may offer some nice properties for performance of
annotation based merging. 


Cheers,
Rob
-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070604/f431cb18/attachment.pgp