[Peter Samuelson]
> What I want is much simpler. Given a conflict region, make it smaller
> by removing lines from the top and bottom that do not actually differ.
> Don't eliminate the conflict entirely. My "proposal" does not lose any
> information; by reducing the size of the conflict region
To take a simple example: given 4 groups of lines, say one side of a
merge wants to add groups { 1 2 4 } and the other side wants to add
groups { 1 3 4 }. Subversion will mark a conflict: { 1 2 4 } vs.
{ 1 3 4 }. The real conflict is much smaller, { 2 } vs. { 3 }. The
readability difference can be quite significant when there are a lot of
lines in groups 1 or 4.
--
Peter Samuelson | org-tld!p12n!peter | http://p12n.org/
