upstream/mercurial-mirror Files · contrib/packaging/wix/defines.wxi

filemerge: add support for the new "mergediff" marker style to premerge...

filemerge: add support for the new "mergediff" marker style to premerge This adds support for the new "mergediff" conflict marker style to "merge-tools.<tool>.premerge" (the new value is called "keep-mergediff"). Differential Revision: https://phab.mercurial-scm.org/D9606

Gregory Szorc - - Load All Authors

File last commit:

r42086:c68a1df5 default


                r46755:3ca5ca38

default

Download file

             defines.wxi
        
                    9 lines
            
             | 135 B
            
                | text/plain
            
             |
                TextLexer

/ contrib / packaging / wix / defines.wxi

History | Annotation | Raw |Copy content |Copy permalink

				<Include>

				<?if $(var.Platform) = "x64" ?>
				<?define IsX64 = yes ?>
				<?else?>
				<?define IsX64 = no ?>
				<?endif?>

				</Include>

	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