Non-expected conflict

[Jan Hudec]

On Fri, Mar 24, 2006 at 08:14:05 -0500, Aaron Bentley wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> Jan Hudec wrote:
> 
> |>BitKeeper would.  Codeville would.  Darcs should, but last I heard,
> |>criss-cross gave it indigestion.
> |
> |
> | Ok. I never managet to get through the marketing babble to any technical
> | information about BitKeeper, so maybe it uses a better algorithm than
> | 3-way merge.
> 
> It's based on SCCS, and so it uses a variant of SCCS merge, i.e. a weave
> merge.

If it really does, then I'd love to hear from someone who used it what it's
merge tool provides. I know from some screenshots I've seen that it presents
two *diffs* and the target, but I don't know what is their base.

-- 
						 Jan 'Bulb' Hudec <bulb at ucw.cz>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 191 bytes
Desc: Digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060325/97dd3d3d/attachment.pgp