upstream/mercurial-mirror Files · mercurial/templates/atom

partial-merge: add support for `.args` config (`$local` etc.)...

partial-merge: add support for `.args` config (`$local` etc.) It will be useful to be able to define custom command-line arguments per partial merge tool just like we have for regular merge tools. In particular, I expect the same binary to handle multiple languages, so it will be useful to be able to pass some argument indicating the language, or perhaps simply an argument defining a regex that's used for finding lines to merge as a sorted set. Differential Revision: https://phab.mercurial-scm.org/D12383

Martin von Zweigbergk -


            r49839:9dfbea54

default

Name	Size	Modified	Last Commit	Author
/ mercurial / templates / atom
__init__.py	Loading ...
bookmarkentry.tmpl	Loading ...
bookmarks.tmpl	Loading ...
branchentry.tmpl	Loading ...
branches.tmpl	Loading ...
changelog.tmpl	Loading ...
changelogentry.tmpl	Loading ...
error.tmpl	Loading ...
filelog.tmpl	Loading ...
header.tmpl	Loading ...
map	Loading ...
tagentry.tmpl	Loading ...
tags.tmpl	Loading ...

	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