Switch to weave merge?
aaron.bentley at utoronto.ca
Fri May 26 16:23:01 BST 2006
-----BEGIN PGP SIGNED MESSAGE-----
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.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org
-----END PGP SIGNATURE-----
More information about the bazaar