upstream/mercurial-mirror Files · mercurial/templates/raw/logentry.tmpl

tests: make merge conflicts explicit in `hg annotate` tests...

tests: make merge conflicts explicit in `hg annotate` tests We were using `true` as merge tool. I think it makes the test easier to understand if we make the conflicts explcit. It also papered over a conflict that shouldn't have been a conflict (just a bug in copy tracing). I've marked that "BROKEN". Differential Revision: https://phab.mercurial-scm.org/D6252

Alexander Plavin - - Load All Authors

File last commit:

r19429:c8490dcc default


                r42327:7116fc61

default

Download file

             logentry.tmpl
        
                    6 lines
            
             | 172 B
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / raw / logentry.tmpl
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Alexander Plavin
    
hgweb: add changelog and search templates to raw style...

              r19429
            
      changeset:   {node}

      revision:    {rev}

      user:        {author}

      date:        {date|rfc822date}

      summary:     {desc}

      {branches%branchname}{tags%tagname}{bookmarks%bookmarkname}

	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

Alexander Plavin hgweb: add changelog and search templates to raw style...	r19429	changeset: {node}
		revision: {rev}
		user: {author}
		date: {date\|rfc822date}
		summary: {desc}
		{branches%branchname}{tags%tagname}{bookmarks%bookmarkname}