[MERGE REVIEW] conflict API update

[John Arbash Meinel]

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

+1 on this.

I've decided to stay away from the log speedup patches. I was +0 on the
changes, so I'll let someone else decide if it is good enough to bring
it in.

John
=:->


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 254 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060222/7011e2dc/attachment.pgp