##// END OF EJS Templates
merge: check for conflicting actions irrespective of length of bids...
merge: check for conflicting actions irrespective of length of bids We should for whether bids contain a combination of actions which conflict with each other. Since right now we only have couple of such combination, and combinations also consist of two actions, we were checking for them only when length of bids is 2. Let's check that irrespective of the length of bids.

File last commit:

r30558:7817df55 stable
r46207:588068d5 default
Show More
filelogentry.tmpl
7 lines | 315 B | application/x-cheetah | CheetahLexer
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 <item>
<title>{desc|strip|firstline|strip|escape}</title>
av6
hgweb: add missing slash to file log url in rss style
r30558 <link>{urlbase}{url|urlescape}log/{node|short}/{file|urlescape}</link>
Steven Brown
hgweb: apply websub filter to the changeset description in rss and atom feeds...
r21486 <description><![CDATA[{desc|strip|escape|websub|addbreaks|nonempty}]]></description>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 <author>{author|obfuscate}</author>
<pubDate>{date|rfc822date}</pubDate>
</item>