##// END OF EJS Templates
graft: don't drop the second parent on unsuccessful merge (issue3498)...
graft: don't drop the second parent on unsuccessful merge (issue3498) This replicates the strategy of rebase, which postpones setparents and duplicatecopies after checking the merge stats. Without the second parent, resolve cannot redo merge.

File last commit:

r9999:f91e5630 default
r17045:52ea9ce5 stable
Show More
notfound.tmpl
12 lines | 252 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}">main repository list page</a>.
{footer}