Hi, I'm using diff mode to do 3way merging.
3way merging is for example situation, where two people make change to
single file at the same time, so you have "base" version, "your" version
and "other" version. You could commit "your" version and then merge the
"other" version, but this does not work very well in the cases when the
two people try to work on a single problem. You need to compare his
change against your change to merge things properly; while seeing "your"
result against "his" change is not that helpful.
I think that the Vim color highlighting for such case could be made more
user friendly. I'm speaking from the position of user, I haven't checked
Vim source code at all. As an example I created two images, one showing
current status, and one showing my feature request. The yellow
descriptions are not part of the request, they are meant for easier
orientation in the pictures.
Basically I would like to see highlighted only the parts of the file
which have been really modified. If you look at the feature.png:
1. I modified 111 to XXX, so this line is highlighted only in "base" and
"my"
2. I removed two lines, the color highlight is again only in "base" and
"my"
3. On this line we both made change, so it's highlighted in all three
buffers.
4. My peer added two lines. To keep the line position synchronized
across buffers I would leave the "missing ---- marks" but would not
colorize them.
5. My peer made change, but that does not directly clash with any of my
changes, so it does not have to be highlighted in "my" buffer.
The changes clash only in case "3". If you compare the two images, I
think that with the feature.png it's easier to spot it than in the
current.png status.
This would easy my life really. Or can you thing about even more helpful
way ? I would be more than happy to support the request by some amount
of money.
Thanks
--
Vlad
pgpUEeN67ccVY.pgp
Description: PGP signature
