[MERGE] doc update

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Jelmer Vernooij wrote:
> +2) apply delta from base to new rev (O(changes))
> +applying changes to files is approx (O(size-of-changed-files))

BB:tweak

applying changes to files is approx O(lines-in-files ^ 2)
I mentioned this in my review.

> +Detecting name conflicts should be O(siblings). Alternatively, conflicts 
> +with existing files can be detected using stat() or and conflicts with new files 

"stat or and ...?"

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFGxFD50F+nu1YWqI0RAs6GAJ9VH2jEEtjWp3fEloedsxr8PG6TgACcDYYu
31VlbZBKJhZZkP5cGcyBYrk=
=LWPY
-----END PGP SIGNATURE-----