Switch to weave merge?

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

John Yates wrote:
> Aaron Bentley wrote:

> Under what circumstances do the results diverge?

They diverge when line identity is useful for avoiding false matches.
So lines that have the same text but different origins can be more
confusing for knit merge.

On the other hand, knit merge is better at handling convergence.

>  Is one inherently more powerful than the other?

Not really.  They have different strengths, but they will be equivalent
in the vast majority of cases.

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

iD8DBQFEdx1V0F+nu1YWqI0RAk1+AJ0ehRc4mQeBH9gPC/Seuxbg07ezngCdEheY
V6GHzZgBDxUUvkeahNKdL6A=
=08QI
-----END PGP SIGNATURE-----