Mercurial Mercurial > hg-stable / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
templates/error.tmpl
author Dov Feldstern <dfeldstern@fastimap.com>
Fri, 04 Apr 2008 02:21:53 +0300
changeset 6522 2b181fb3a70a
parent 5837 2580d418e3f0
permissions -rw-r--r--
use internal merge tool when specified for a merge-pattern in hgrc It is possible to specify in the hgrc file that one of the internal merge tools (internal:fail, internal:local or internal:other) be used for performing merges on files matching a given pattern. However, this setting is not being acted upon (the merge tool is not found). This patch fixes that.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1554
68ec7b9e09a4 Catch IOErrors and RepoErrors when serving repositories via hgweb.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset 
     1
 
#header#
68ec7b9e09a4 Catch IOErrors and RepoErrors when serving repositories via hgweb.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset 
     2
 
<title>Mercurial Error</title>
68ec7b9e09a4 Catch IOErrors and RepoErrors when serving repositories via hgweb.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset 
     3
 
</head>
68ec7b9e09a4 Catch IOErrors and RepoErrors when serving repositories via hgweb.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset 
     4
 
<body>
68ec7b9e09a4 Catch IOErrors and RepoErrors when serving repositories via hgweb.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset 
     5
 












68ec7b9e09a4
Catch IOErrors and RepoErrors when serving repositories via hgweb.



Thomas Arendsen Hein <thomas@intevation.de>


parents: 

diff
changeset




     6


<h2>Mercurial Error</h2>













68ec7b9e09a4
Catch IOErrors and RepoErrors when serving repositories via hgweb.



Thomas Arendsen Hein <thomas@intevation.de>


parents: 

diff
changeset




     7














68ec7b9e09a4
Catch IOErrors and RepoErrors when serving repositories via hgweb.



Thomas Arendsen Hein <thomas@intevation.de>


parents: 

diff
changeset




     8


<p>








5837






2580d418e3f0
Issue #880: Simple misspelling ('occured') in web error message.



Jesse Glick <jesse.glick@sun.com>


parents: 
1554

diff
changeset




     9


An error occurred while processing your request:








1554






68ec7b9e09a4
Catch IOErrors and RepoErrors when serving repositories via hgweb.



Thomas Arendsen Hein <thomas@intevation.de>


parents: 

diff
changeset




    10


</p>













68ec7b9e09a4
Catch IOErrors and RepoErrors when serving repositories via hgweb.



Thomas Arendsen Hein <thomas@intevation.de>


parents: 

diff
changeset




    11


<p>













68ec7b9e09a4
Catch IOErrors and RepoErrors when serving repositories via hgweb.



Thomas Arendsen Hein <thomas@intevation.de>


parents: 

diff
changeset




    12


#error|escape#













68ec7b9e09a4
Catch IOErrors and RepoErrors when serving repositories via hgweb.



Thomas Arendsen Hein <thomas@intevation.de>


parents: 

diff
changeset




    13


</p>













68ec7b9e09a4
Catch IOErrors and RepoErrors when serving repositories via hgweb.



Thomas Arendsen Hein <thomas@intevation.de>


parents: 

diff
changeset




    14














68ec7b9e09a4
Catch IOErrors and RepoErrors when serving repositories via hgweb.



Thomas Arendsen Hein <thomas@intevation.de>


parents: 

diff
changeset




    15


#footer#















hg-stable