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

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

             changeset.tmpl
        
                    9 lines
            
             | 124 B
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / raw / changeset.tmpl
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

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

              r9999
            
      {header}

      # HG changeset patch

      # User {author}

      # Date {date|hgdate}

      # Node ID {node}

      {parent%changesetparent}

      {desc}

      {diff}

	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}
		# HG changeset patch
		# User {author}
		# Date {date\|hgdate}
		# Node ID {node}
		{parent%changesetparent}
		{desc}

		{diff}