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

RhodeCode Free Hosting

- This repo
- ?
- Use '/' key to quickly access this field. - Enter a name of repository, or repository group for quick search. - Prefix query to allow special search: user:admin, to search for usernames, always global user_group:devops, to search for user groups, always global pr:303, to search for pull request number, title, or description, always global commit:efced4, to search for commits, scoped to repositories or groups file:models.py, to search for file paths, scoped to repositories or groups For advanced full text search visit: repository search
Home
Public journal
Gists
Sign in

upstream » mercurial-mirror

RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

simplemerge: enable option to resolve conflicts one way...

simplemerge: enable option to resolve conflicts one way With this change, the simplemerge algorithm grows an option to only return the local or the other hunk in a conflicting region.

Dan Villiom Podlaski Christiansen - - Load All Authors

File last commit:

r9999:f91e5630 default


                r26223:ed12abab

default

Download file

             fileannotate.tmpl
        
                    5 lines
            
             | 44 B
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / raw / fileannotate.tmpl
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
      {header}

      {annotate%annotateline}

      {footer}

	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

Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	{header}
		{annotate%annotateline}
		{footer}