Bad base selection / three-way-text-merge issues

[Aaron Bentley]

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

Robert Collins wrote:
| On Thu, 2005-10-20 at 10:23 -0400, Aaron Bentley wrote:
|
|>I guess what I really want from an algorithm is:
|>
|>- - compare THIS and OTHER
|>- - where they disagree with one another, find the equivalent lines in
BASE
|>- - do a three-way merge; if THIS matches BASE, OTHER wins, if OTHER
|>matches base, THIS wins, otherwise conflict.
|
|
| I think this is insufficient - lines proximity to other lines influences
| the semantic behaviour

Perhaps you could clarify?

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

iD8DBQFDW9D40F+nu1YWqI0RAjFrAJ951iT8pBRqQu/cVWS9eaKymPOOmwCghXMC
Q15WSoH36Tg6VbVyF79rOac=
=AXZo
-----END PGP SIGNATURE-----