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

[Robert Collins]

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 - but I too would like less duplicate 'good'
content in the conflicting areas.

Rob

-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20051023/e1139178/attachment.pgp