Use smerge minor mode in emacs to resolve conflicts.
The condition-case is used to suppress errors with emacs versions before 21.
#header#
<title>Mercurial repositories index</title>
</head>
<body>
<h2>Mercurial Repositories</h2>
The specified repository "#repo|escape#" is unknown, sorry.
Please go back to the main repository list page.
#footer#