Jump to content

Semantic Merge via Tortoise Hg


Recommended Posts

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.




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!

Link to comment
Share on other sites


This topic is now archived and is closed to further replies.

  • Create New...