Re: [Gnu-arch-users] Re: <<< conflict markers

[Aaron Bentley]

Jan Hudec wrote:
> > But it would have the same effect as `tla star-merge --three-way', so it
> > would be a bit redundant.
>
>
> But star-merge is far less efficient for this.
>
> replay and update would equivalent with three-way merge. 

Update is a three-way merge.  It applies the delta between the tree 
revision and your current changes to the latest version in the archive, 
and you get the results in your project tree.

Aaron

--
Aaron Bentley
Director of Technology
Panometrics, Inc.