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

On Sun, 2005-10-23 at 14:05 -0400, Aaron Bentley wrote:

> | I think this is insufficient - lines proximity to other lines influences
> | the semantic behaviour
> 
> Perhaps you could clarify?

Sure. If you have:

A
A
A

and patch that to 
A
B
A
in one branch, and 
C
A
A

in another, a merge of them should conflict IMO rather than giving
C
B
A


Rob

-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.

signature.asc
Description: This is a digitally signed message part