##// END OF EJS Templates
test: use the "correct" merge tool in `test-rebase-detach.t`...
test: use the "correct" merge tool in `test-rebase-detach.t` The value of `HGMERGE` overrides the value passed through --config. We are about to drop this `HGMERGE` environment variable so we update the value used in config to match what is currently in use. This is another example of confusion introduced by the `HGMERGE` environment variable.

File last commit:

r29436:849b8e84 default
r40502:b57f2734 default
Show More
changelogentry.tmpl
41 lines | 1.5 KiB | application/x-cheetah | CheetahLexer
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 <item>
Aaron Jensen
hgweb: adding branch names from inbranch template to rss feed
r21118 <title>{inbranch%"{if(name, '[{name|escape}] ')}"}{branches%"{if(name, '[{name|escape}] ')}"}{desc|strip|firstline|strip|escape}</title>
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <guid isPermaLink="true">{urlbase}{url|urlescape}rev/{node|short}</guid>
av6
hgweb: reindent rss/changelogentry.tmpl...
r29436 <link>{urlbase}{url|urlescape}rev/{node|short}</link>
Aaron Jensen
hgweb: adding branch, tags, bookmarks, user, and file list to rss feed entries
r21057 <description>
av6
hgweb: reindent rss/changelogentry.tmpl...
r29436 <![CDATA[
<table>
<tr>
<th style="text-align:left;">changeset</th>
<td>{node|short}</td>
</tr>
<tr>
<th style="text-align:left;">branch</th>
<td>{inbranch%"{name|escape}"}{branches%"{name|escape}"}</td>
</tr>
<tr>
<th style="text-align:left;">bookmark</th>
<td>{bookmarks%"{name|escape}"}</td>
</tr>
<tr>
<th style="text-align:left;">tag</th>
<td>{tags%"{name|escape}"}</td>
</tr>
<tr>
<th style="text-align:left;vertical-align:top;">user</th>
<td>{author|obfuscate}</td>
</tr>
<tr>
<th style="text-align:left;vertical-align:top;">description</th>
<td>{desc|strip|escape|websub|addbreaks|nonempty}</td>
</tr>
<tr>
<th style="text-align:left;vertical-align:top;">files</th>
<td>{files}</td>
</tr>
</table>
]]>
</description>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 <author>{author|obfuscate}</author>
<pubDate>{date|rfc822date}</pubDate>
</item>