view templates/error.tmpl @ 1772:b1a7fd503a29

hgmerge: logic changes Details: - keep automatic merge conflicts in $LOCAL - do not assume that $EDITOR returns proper error code - fix a slight mistake in diff+patch merge success detection (it could succeed if the $EDITOR failed to run)
author Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
date Tue, 21 Feb 2006 15:48:16 -0600
parents 68ec7b9e09a4
children 2580d418e3f0
line wrap: on
line source

#header#
<title>Mercurial Error</title>
</head>
<body>

<h2>Mercurial Error</h2>

<p>
An error occured while processing your request:
</p>
<p>
#error|escape#
</p>

#footer#