Use smerge minor mode in emacs to resolve conflicts.
The condition-case is used to suppress errors with emacs versions before 21.
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#'
manifest = manifest.tmpl
manifestdirentry = 'drwxr-xr-x {basename}\n'
manifestfileentry = '{permissions|permissions} {size} {basename}\n'
index = index.tmpl
indexentry = '#url#\n'