merge conflicts - simplifying afterwards-tool.

[Robert Collins]

One of the interesting things I see is when the matching regions things
get confused, like:


common text:

C
C
C
C
C



left side:

C
C
L
C
L
C
L
C


Right side:

C
C
R
C
R
C
R
C



merged :

C
C
<<<
L
===
R
>>>
C
<<<
L
===
R
>>>
C
<<<
L
===
R
>>>
C


What I'd *LOVE* is a tool to coalesce selected conflicts of that nature:

C
C
<<<
L
C
L
C
L
===
R
C
R
C
R
>>>>
C
<<<
L
===
R
>>>
C


This matters because often I want to take all of the LCLCL sequence and
the RCRCR sequence: they both added code and happened to have common
lines in close proximity.

This is related to but not superceded by the patentience algorithm John
is working on.

Cheers,
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/20051215/549abd29/attachment.pgp