Short version of the question: Since I already have TortoiseHg, I right clicked on that file trying to see the merge conflict visually, but there is no way to see it?

Details:

To make a simple case of merge conflict, I hg init a repo on Win 7, and then clone it to another folder.

Now, in one working directory, i added the line "the code is 123", committed.

And in the other folder, i did an "hg pull" and "hg update"

Now, I go back to the first folder, and change "123" to "123abc", and then do an "hg commit"

And then I go to the other folder and edit "123" to "123xyz" over there, and do an "hg commit", and when "hg push", it says it can't.

So I try to use any visual tool to see how the conflict is like, but ... TortoiseHg doesn't seem to have any option to do that?