Question: hg transplant fails - how do I 'fix up the merge' as it suggests?