Prevent clobbering of uncommitted changes.
Use HG perge as a performant way of cleaning out the working directory.
Fixed merging.
Checkout tip in both HG and GIT when complete.