[MERGE REVIEW] conflict API update

[Aaron Bentley]

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

Hi all,

This patch gets the 'conflicts' and 'resolve' commands under test, and
switches them to the new functions instead of the deprecated API.

It's also at http://panoramicfeedback.com/opensource/bzr/bzr.ab (which
also has Duchier's log speedup)

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

iD8DBQFD/KJn0F+nu1YWqI0RAgDOAJ4qxQESRRl0ERtwDK37Sa8Ak8UhNwCfVkgy
+B6w9ps4vPzcbwVcmbQx8HM=
=3V24
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: conflicts.patch
Type: text/x-patch
Size: 4338 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060222/d1060b14/attachment.bin