upstream/mercurial-mirror Files · mercurial/templates/coal/map

simplemerge: use same newline detection for :mergediff as for :merge[3]...

simplemerge: use same newline detection for :mergediff as for :merge[3] The `:merge` and `:merge3` markers used the newline style detected from the base input. The `:mergediff` style always used LF as newline character. This patch teaches `:mergediff` to use the same detection as the others did. Differential Revision: https://phab.mercurial-scm.org/D11976

Matt Mackall - - Load All Authors

File last commit:

r29813:5f86818c default


                r49391:2c802d46

default

Download file

             map
        
                    2 lines
            
             | 45 B
            
                | text/plain
            
             |
                TextLexer

/ mercurial / templates / coal / map

History | Source | Raw |Copy content |Copy permalink

Matt Mackall coal: use inheritance to derive from paper...	r29813	__base__ = ../paper/map
		header = header.tmpl

	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