Custom labels are no longer visible by default
I use meld in Tortoise HG. I have Totroise HG configured to use meld as the resolve tool and as the 3-way diff. This issue is about the 3-way diff. I have no idea how you'd use Meld outside of THG.
In Tortoise HG what I do is:
- I do a merge. There are conflict
- I resolve the conflict with whatever tool
- I review and edit the merged version by clicking the "3-way diff" button which launches Meld showing a 3way diff.
So that launches Meld and shows a 3-way diff where on one side there is the working-directory version, on the opposite side there is the "other revision" version (the one that I am merging into the working directory), and in the center the proposed merged version.
The issue is: I have no clue which one (left or right) is the working directory version and which one is the "other revision" version.
At the top of each there is a file path, but that doesn't help because both paths are like /tmp/some-numbers-and-shit/whatever/filename.xml and I don't know how to interpret those.
It used to be the case that somewhere at the top (I seem to remember in the window title bar) it used to read "local -- current -- other", or something like that, or of course viceversa. While not the most intuitive thing in the world, that was enough for me to know which one was what.
Now that hint is no longer there.