##// 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:

r18526:9409aeaa stable
r39611:aa022f88 default
Show More
bookmarkentry.tmpl
8 lines | 321 B | application/x-cheetah | CheetahLexer
<entry>
<title>{bookmark|escape}</title>
<link rel="alternate" href="{urlbase}{url|urlescape}rev/{node|short}"/>
<id>{urlbase}{url|urlescape}#bookmark-{node}</id>
<updated>{date|rfc3339date}</updated>
<published>{date|rfc3339date}</published>
<content type="text">{bookmark|strip|escape}</content>
</entry>