merge conflicts - simplifying afterwards-tool.

[Robert Collins]

On Thu, 2005-12-15 at 10:23 -0600, John Arbash Meinel wrote:
> Robert Collins wrote:
> > One of the interesting things I see is when the matching regions things
> > get confused, like:
> > 
> 
> Well, I think one problem is sometimes you want either behavior, just
> depending on what is being changed. If I understand you correctly, I
> think you are saying that you want sort of the opposite of the current
> --reprocess behavior. You want conflict regions to be expanded so they
> merge into one large conflict even though there are matching lines
> inbetween.


Yes, thats a good example. And yes, sometimes one needs one way,
sometimes a different way. Thus my desire for a low level tool I can
tell to correct it for me post hoc.

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/20051216/3e6ee5ee/attachment.pgp