view templates/error.tmpl @ 6521:a3668330f14a

test that internal merge tools are used when set for a merge-pattern in hgrc It is possible to specify that one of the internal merge tools (internal:fail, internal:local or internal:other) should be used for performing merges on files matching a given pattern. This test makes sure that such a setting actually works.
author Dov Feldstern <dfeldstern@fastimap.com>
date Fri, 04 Apr 2008 02:20:58 +0300
parents 2580d418e3f0
children
line wrap: on
line source

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

<h2>Mercurial Error</h2>

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

#footer#