view templates/error.tmpl @ 6297:fed1a9c22076

dirstate.remove: during merges, remember the previous file state We encode the previous state as a negative file size (AFAICS, previous versions of hg always have size == 0 when state == 'r'). We save the state of 'm'erged and dirty files, because they're the two states that indicate that a file has to be committed on a merge to correctly record per-file history.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Tue, 18 Mar 2008 04:07:39 -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#