[RFC] Use KnitVersionedFile.plan_merge for all VersionedFiles

[Aaron Bentley]

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

Martin Pool wrote:
> On 14 Jul 2006, John Arbash Meinel <john at arbash-meinel.com> wrote:
> 
>>So I agree that we should switch a common merge algorithm.
> 
> 
> Yes, i think so too.

Cool.  I'll get that in soon after the 0.9 release.

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

iD8DBQFEv4td0F+nu1YWqI0RAniBAJ41PTsdQEm08AtxM5fyrPbfQ0urZwCeLknf
+sKocV2aavnmDKjaYsPnjJk=
=kG0U
-----END PGP SIGNATURE-----