Non-expected conflict

[Aaron Bentley]

-----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.

| Darcs merging algorithm is hard to analyze, but I guess it would spend a
| *lot* of time sorting the patches, after which it would produce a
| relatively reasonable merge.

Yeah, I hear it gets into exponential time.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD4DBQFEI+210F+nu1YWqI0RAr4CAJ9aN9Hj1LNnWNgDKMfmvNvsNfZvQACYrPqz
HxhdnxOAfdHHdnkOljVTcg==
=1CNn
-----END PGP SIGNATURE-----