Add instructions how to redo/finish failed merge with local working directory. b2ae81a7df29 already implemented this for branch merges.

#motd#
<div class="logo">
powered by<br/>
<a href="http://www.selenic.com/mercurial/">mercurial</a>
</div>

</body>
</html>