Jump to content

Semantic Merge via Tortoise Hg


Go to solution Solved by manu,

Recommended Posts

  • Solution

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.

post-112-0-65157900-1374592157_thumb.png

 

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 :)

post-112-0-48348400-1374592172_thumb.png

 

Hope it helps!

  • Like 1
Link to post
Share on other sites

Create an account or sign in to comment

You need to be a member in order to leave a comment

Create an account

Sign up for a new account in our community. It's easy!

Register a new account

Sign in

Already have an account? Sign in here.

Sign In Now
×
×
  • Create New...