upstream/mercurial-mirror Files · mercurial/templates/json/changelist.tmpl

meld: enable auto-merge...

meld: enable auto-merge This tells meld to resolve trivial conflicts before presenting the user with the remaining conflicts. This was attempted 5 years ago, but then --auto-merge was too new that the patch was rejected out of concern that users still had an older version of meld installed [1]. Maybe it's safe to assume that they have a newer version now. [1] https://www.mercurial-scm.org/pipermail/mercurial-devel/2013-April/050084.html Differential Revision: https://phab.mercurial-scm.org/D4665

Gregory Szorc - - Load All Authors

File last commit:

r24588:0bf54479 default


                r39779:f803bcb9

default

Download file

             changelist.tmpl
        
                    5 lines
            
             | 124 B
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / json / changelist.tmpl
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      \{

        "node": {node|json},

        "changeset_count": {changesets|json},

        "changesets": [{join(entries%changelistentry, ", ")}]

      }

	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

				\{
				"node": {node\|json},
				"changeset_count": {changesets\|json},
				"changesets": [{join(entries%changelistentry, ", ")}]
				}