TortoiseHG Merge has dangerous no cancel option
Created originally on Bitbucket by kalbr88
I was merging files using the HG Workbench (did Merge with Local...) got dialog that had link for must be resolved. Clicked that, got the 'Resolve conflicts' popup. Did Mercurial Resolve and was left with 5 files. Then clicked 'Tool Resolve' on some .rc/.h files. The .rc file is in some different format so the tool thought it was a binary. After trying all merge tools, it popped up a dialog asking this:
TortoiseHG Prompt no tool found to merge ...SoundCloud.rc keep (l)ocal or take (o)ther.
There are only two buttons [Local][Other]
There is no cancel which is really bad. I can't see the files so don't know which to take and forcing a choice here is bad.
Must be a cancel button to abort the merge