Can't merge with ancestor that was merged out of existence
Created originally on Bitbucket by ekolis (Ed Kolis)
I merged some changes out of existence because they didn't work out, but now I want to try working on them again. However I can't merge them back into the latest code, because TortoiseHG won't let me merge with an ancestor, even though the ancestor's changes were destroyed in the merge.