##// END OF EJS Templates
tests: add merge test for changeset 9fe267f77f56...
tests: add merge test for changeset 9fe267f77f56 When all the files in a directory are moved somewhere else, and new files are added in changesets of the local branch, a subsequent pull and merge shouldn't rename the locally added files too.

File last commit:

r1554:68ec7b9e default
r4696:59b8f936 default
Show More
error.tmpl
15 lines | 173 B | application/x-cheetah | CheetahLexer
#header#
<title>Mercurial Error</title>
</head>
<body>
<h2>Mercurial Error</h2>
<p>
An error occured while processing your request:
</p>
<p>
#error|escape#
</p>
#footer#