tree-less merges

[Aaron Bentley]

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

Michael Hudson wrote:
> I don't particularly care about not hitting the disk at all or not
> keeping the full texts of all changed files in RAM, but these would be
> nice things of course.

I forgot to say: if changed files are permitted to hit disk, that would
probably be much more RAM-friendly, which would make it a more general
solution.  Also, easier to implement.

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

iD8DBQFHQxFj0F+nu1YWqI0RAriCAKCFDpQzI9++Ia7tTqKsRPJy5ytdfgCfRbqe
EqtTWo1HAEaMJo9Ej1spIyA=
=il8K
-----END PGP SIGNATURE-----