Missing merge options
Created originally on Bitbucket by Anonymous
After using TortoiseHG for a while I regularly run into two important things missing:
A checkbox in the merge screen to force the merge tool to be displayed. Sometimes when I let TortoiseHG merge two branches it is removing all my new code replacing it with the old. In this case I just want to resolve it in kdiff3, but it does not give me that option.
An option in the repository where you can rightclick on a single file in any branch and choose "Merge to local". When we release a new version we branch this and keep it in a separate directory. Sometimes we want to take a fix from the main (trunk) branch and transplant it into the release branch and build a service release.