[MERGE REVIEW] new conflict handling

[Aaron Bentley]

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

Okay, since I haven't heard anything on this one, and it address the
problems noted with the previous version, I'm merging this.

Aaron

Aaron Bentley wrote:
| 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

iD8DBQFEOTEv0F+nu1YWqI0RAkwQAJwLu4kBiauUU1++/k8Ub4chrcKjDwCaA9aB
oYlXIfJYSgQIIYC9lbL/wGs=
=8l4p
-----END PGP SIGNATURE-----