Use smerge minor mode in emacs to resolve conflicts. The condition-case is used to suppress errors with emacs versions before 21.

#header#
# HG changeset patch
# User #author#
# Date #date|hgdate#
# Node ID #node#
#parent%changesetparent#
#desc#

#diff#