upstream/mercurial-mirror Files · mercurial/templates/raw/changelog.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:

r19905:078ccd78 default


                r42327:7116fc61

default

Download file

             changelog.tmpl
        
                    5 lines
            
             | 67 B
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / raw / changelog.tmpl
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      {header}

      # HG changelog

      # Node ID {node}

      {entries%changelogentry}

	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

				{header}
				# HG changelog
				# Node ID {node}

				{entries%changelogentry}