##// END OF EJS Templates
merge: move messages about possible conflicts a litte earlier...
merge: move messages about possible conflicts a litte earlier I actually wanted to reduce the amount of code around the call to applyupdates(), so I tried moving these warnings a little earlier, and I think it makes the output make a little more sense (see changes to test cases).

File last commit:

r18526:9409aeaa stable
r26957:d16d7317 default
Show More
notfound.tmpl
12 lines | 262 B | application/x-cheetah | CheetahLexer
{header}
<title>Mercurial repository not found</title>
</head>
<body>
<h2>Mercurial repository not found</h2>
The specified repository "{repo|escape}" is unknown, sorry.
Please go back to the <a href="{url|urlescape}">main repository list page</a>.
{footer}