miryamgsm Posted July 23, 2013 Report Share Posted July 23, 2013 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 Link to comment Share on other sites More sharing options...
manu Posted July 23, 2013 Report Share Posted July 23, 2013 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! Link to comment Share on other sites More sharing options...
miryamgsm Posted July 23, 2013 Author Report Share Posted July 23, 2013 Thanks it works! Somehow I was having another "mercurial.ini" and the Tortoise wasn't using the correct one. Link to comment Share on other sites More sharing options...
Recommended Posts
Archived
This topic is now archived and is closed to further replies.