putting calendar and address book into version control

[Aaron Bentley]

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

Alexander Belchenko wrote:
> Daniel Mark Watkins пишет:

>> At some point today, I'm going to sit down with Aaron Bentley and we'll
>> start talking about a plan for per-file pluggable merge algorithms.
>> There's not really a timeframe on this yet, but once this support
>> exists then a merge algorithm to remove this problem could be written.
> 
> Pluggable diff algorithm is also needed. And may be pluggable status?

We already have support for pluggable diff algorithms-- all we need is
an algorithm.

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

iD8DBQFH0Phi0F+nu1YWqI0RAjozAJ9bEjbNEIrEIpBEdtMExyENeeBW4gCdEfEa
LD1wN2Fw+jQAXi/MO02a+ts=
=eQn4
-----END PGP SIGNATURE-----