upstream/mercurial-mirror Files · mercurial/templates/rss/filelogentry.tmpl

tests: add test of rebase with conflict in merge commit...

tests: add test of rebase with conflict in merge commit It doesn't seem like we had any tests of this. I think it's pretty weird that the two parents we're merging are not the working copy parents during the conflict resolution. Differential Revision: https://phab.mercurial-scm.org/D7824

av6 - - Load All Authors

File last commit:

r30558:7817df55 stable


                r44816:7f7c8521

default

Download file

             filelogentry.tmpl
        
                    7 lines
            
             | 315 B
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / rss / filelogentry.tmpl
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      <item>

          <title>{desc|strip|firstline|strip|escape}</title>

          <link>{urlbase}{url|urlescape}log/{node|short}/{file|urlescape}</link>

          <description><![CDATA[{desc|strip|escape|websub|addbreaks|nonempty}]]></description>

          <author>{author|obfuscate}</author>

          <pubDate>{date|rfc822date}</pubDate>

      </item>

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				<item>
				<title>{desc\|strip\|firstline\|strip\|escape}</title>
				<link>{urlbase}{url\|urlescape}log/{node\|short}/{file\|urlescape}</link>
				<description><![CDATA[{desc\|strip\|escape\|websub\|addbreaks\|nonempty}]]></description>
				<author>{author\|obfuscate}</author>
				<pubDate>{date\|rfc822date}</pubDate>
				</item>