Hello --
I'm not sure if this is my misunderstanding of 3-way (or even 2-way) text merge, or an actual bug. But here's the situation: I often don't see any highlighting when merge output successfully merges in a change. Take this example from the attached picture:
Now, from my perspective, the output window should show this change in light purple, since it is a change -- coming from the right file -- to the original ancestor file. Instead, the vertical change bar (to the left of the output window) and the merge background color are both plain white (which, to me, indicates no change). Changes on the left seem to always show up in light blue (as expected).
If this is not a bug, what am I missing here? Please explain.
Thanks,
--Dave Novak
I'm not sure if this is my misunderstanding of 3-way (or even 2-way) text merge, or an actual bug. But here's the situation: I often don't see any highlighting when merge output successfully merges in a change. Take this example from the attached picture:
Now, from my perspective, the output window should show this change in light purple, since it is a change -- coming from the right file -- to the original ancestor file. Instead, the vertical change bar (to the left of the output window) and the merge background color are both plain white (which, to me, indicates no change). Changes on the left seem to always show up in light blue (as expected).
If this is not a bug, what am I missing here? Please explain.
Thanks,
--Dave Novak
Comment