Add instructions how to redo/finish failed merge with local working directory.
b2ae81a7df29 already implemented this for branch merges.
header = header.tmpl
footer = ''
changeset = changeset.tmpl
difflineplus = '#line#'
difflineminus = '#line#'
difflineat = '#line#'
diffline = '#line#'
changesetparent = '# Parent #node#'
changesetchild = '# Child #node#'
filenodelink = ''
filerevision = '#rawfileheader##raw#'
fileline = '#line#'
diffblock = '#lines#'
filediff = filediff.tmpl
fileannotate = fileannotate.tmpl
annotateline = '#author#@#rev#: #line#'