Show differences highlighted also on the result file
Currently, during a 3-way merge, the individual differences are marked only on the Remote, Base and Local files.
On the Result file, it is only shown the main change (line deleted or added), the individual changes are not shown. For example, if you rename a word in one line, on the 3 source files you have that work highlighted, however, on the result file, it's not highlighted, which makes it hard to see what the difference was.
This would be very useful when solving merge conflicts, because then we could see the differences clearly with the changes on top of each other.
3
votes
Anonymous
shared this idea