[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Gnu-arch-users] Bazaar 1.1
From: |
Robert Collins |
Subject: |
Re: [Gnu-arch-users] Bazaar 1.1 |
Date: |
Sat, 29 Jan 2005 12:49:24 +1100 |
On Mon, 2005-01-24 at 16:11 +1100, Zenaan Harkness wrote:
> On Wed, 2005-01-19 at 20:05 +1100, Robert Collins wrote:
> > * 'merge' replaces 'star-merge'. merge uses ancestry data to find
> > merge points outside of the current arch namespace. This
> > removes the need to use join-branch. If star-merge behaviour is
> > desired, it can be obtained by 'merge --star-merge'.
> > Merge also uses three-way by default.
>
> Any doc pointers for more info on this one?
Not really at this point. Its the same three way algorithm that
star-merge -t enables.
Cheers,
Rob
signature.asc
Description: This is a digitally signed message part