Semantic Merge via Tortoise Hg

[miryamgsm 2]

Hello there

 

I've followed the instructions in the below document but I can't merge with Semantic Merge via Tortoise hg GUI. The instructions doesn't seem correct. It works via command line though. Any input for me?

 

http://www.semanticmerge.com/documents/SemanticMerge-Mercurial.pdf

 

Best regards

 

[manu 165]

Hi miryamgsm!

 

First thing you need to double check is that the "mercurial.ini" file your Tortoise is using has the semantic merge and diff tool defined.

 

Then,

 

1. Check the TortoiseHg Settings: You will see the "semantic" set as merge and diff tool.

 

2. Perform the merge with conflict:

  * Select the “semantic” option in "Detected merge/diff tools".

  * Press the "Tool resolve" button and now the SemanticMerge tool will appear

 

Hope it helps!

[miryamgsm 2]

Thanks it works!

 

Somehow I was having another "mercurial.ini" and the Tortoise wasn't using the correct one.