##// END OF EJS Templates
ancestor: silence multiple ancestor warning outside of merge (issue4234)...
ancestor: silence multiple ancestor warning outside of merge (issue4234) The current situation is a bit of a layering violation as merge-specific knowledge is pushed down to lower layers and leaks merge assumptions into other code paths. Here, we simply silence the warning with a hack. Both the warning and the hack will probably go away in the near future when bid merge is made the default.

File last commit:

r9999:f91e5630 default
r21203:9f12d866 stable
Show More
error.tmpl
15 lines | 174 B | application/x-cheetah | CheetahLexer
{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}