[MERGE REVIEW] new conflict handling

Thu Apr 6 05:48:16 BST 2006

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

This is an update to my previous conflict handling.  The behavior is the
same, but, following Martin's suggestion, it is now object-oriented.

Does this now merit a +1?

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

iD8DBQFENJ2Q0F+nu1YWqI0RAkdFAJkBCSvNp2Da+VBzRDfq6nJ+dWDGpgCfcTIS
hQLtrV/CU7QhnDmF8wcpYBo=
=Ig3D
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: conflicts-2.patch
Type: text/x-patch
Size: 47081 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060406/16ba5a30/attachment.bin 