##// END OF EJS Templates
rebase: add tests showing patch conflict detection needs to be smarter in IMM...
rebase: add tests showing patch conflict detection needs to be smarter in IMM This patch adds test which shows that you can't rebase a cset which removes a dir and adds a file of the same as that of dir as there are False positives path conflicts reported. I fixed the case when there is a file and we adds a dir of same name while removing the file, but missed testing the current case. Next patch will fix this. Differential Revision: https://phab.mercurial-scm.org/D4544

File last commit:

r28712:80e92247 default
r39611:aa022f88 default
Show More
bookmarks.tmpl
11 lines | 372 B | application/x-cheetah | CheetahLexer
{header}
<id>{urlbase}{url|urlescape}</id>
<link rel="self" href="{urlbase}{url|urlescape}atom-bookmarks"/>
<link rel="alternate" href="{urlbase}{url|urlescape}bookmarks"/>
<title>{repo|escape}: bookmarks</title>
<summary>{repo|escape} bookmark history</summary>
<author><name>Mercurial SCM</name></author>
{lastchange%feedupdated}
{entries%bookmarkentry}
</feed>