[MERGE] bzr.ab

[John A Meinel]

John A Meinel wrote:
> Aaron Bentley wrote:
>> Because my command defaults change won't be going in, and because Tree
>> Transform needed to back out some of the changes, I've recommitted my
>> work in bzr.ab
>>
>> I believe all of these changes are no-brainers.  Could someone please
>> integrate them?
>>
> 
> Taking these one by one:
> 

...

>  1528 Aaron Bentley     2006-02-13
>       Fix find-merge-base for new API [recommit]
> +1

After I tried to merge, it turns out that I had already applied your
patch for find-merge-base. So we have a conflict of file ids. Is it okay
if I use my original one, or do you need me to use yours?

John
=:->

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