##// END OF EJS Templates
simplemerge: do not allow binary files to abort an entire merge...
simplemerge: do not allow binary files to abort an entire merge When used as the default merge tool, or used as a --tool override, the simplemerge script should not be allowed to raise a util.Abort just because one of the files being merged is binary. Instead, return 1 and mark the file unresolved.

File last commit:

r13964:616ad3f6 default
r14328:3c65cdcf stable
Show More
notfound.tmpl
18 lines | 407 B | application/x-cheetah | CheetahLexer
{header}
<title>Mercurial repository not found</title>
</head>
<body>
<div class="page_header">
<a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a> Not found: {repo|escape}
</div>
<div class="page_body">
The specified repository "{repo|escape}" is unknown, sorry.
<br/>
<br/>
Please go back to the <a href="{url}">main repository list page</a>.
</div>
{footer}