upstream/mercurial-mirror Files · mercurial/templates/map-cmdline.phases

resolve: fix incorrect merge...

resolve: fix incorrect merge The merge from stable into default was semantically incomplete -- a couple of changes in preceding code had to be rewritten here. This code only triggers for change/delete conflicts, so we can't test it yet. We will soon be able to do it, though.

Yuya Nishihara - - Load All Authors

File last commit:

r24907:9570587b default


                r27025:ec372573

default

Download file

             map-cmdline.phases
        
                    3 lines
            
             | 248 B
            
                | text/plain
            
             |
                TextLexer

/ mercurial / templates / map-cmdline.phases

History | Annotation | Raw |Copy content |Copy permalink

				%include map-cmdline.default
				changeset = '{cset}{branches}{bookmarks}{tags}{lphase}{parents}{user}{ldate}{summary}\n'
				changeset_verbose = '{cset}{branches}{bookmarks}{tags}{lphase}{parents}{user}{ldate}{lfiles}{lfile_copies_switch}{description}\n'

	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