Jump to content
miryamgsm

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.

 

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

Share this post


Link to post
Share on other sites

Join the conversation

You can post now and register later. If you have an account, sign in now to post with your account.

Guest
Reply to this topic...

×   Pasted as rich text.   Paste as plain text instead

  Only 75 emoji are allowed.

×   Your link has been automatically embedded.   Display as a link instead

×   Your previous content has been restored.   Clear editor

×   You cannot paste images directly. Upload or insert images from URL.

Loading...

×
×
  • Create New...