##// END OF EJS Templates
merge: make internal merge fail cleanly on symlinks...
merge: make internal merge fail cleanly on symlinks Simplemerge is not symlink aware and will never do the the right thing on symlinks. It would read the symlink as a file and abort with 'No such file or directory' on dangling symlinks. Instead, internal:merge now simply fails to merge symlinks.

File last commit:

r15375:fe9d36a6 stable
r18256:d084df89 default
Show More
shortlogentry.tmpl
5 lines | 416 B | application/x-cheetah | CheetahLexer
<tr class="parity{parity}">
<td class="age">{date|rfc822date}</td>
<td class="author">{author|person}</td>
<td class="description"><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{desc|strip|firstline|escape|nonempty}</a>{inbranch%changelogbranchname}{branches%changelogbranchhead}{tags % '<span class="tag">{name|escape}</span> '}{bookmarks % '<span class="tag">{name|escape}</span> '}</td>
</tr>