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

simplemerge: store input data in MergeInput...

simplemerge: store input data in MergeInput I want to be able to update the file contents for support for partial conflict resolution. Having the text available (and later settable) on `MergeInput` will enable that. Differential Revision: https://phab.mercurial-scm.org/D12144

Martin von Zweigbergk -


            r49595:59c6724d

default

Name	Size	Modified	Last Commit	Author
/ mercurial / templates / raw
__init__.py	Loading ...
changelog.tmpl	Loading ...
changeset.tmpl	Loading ...
error.tmpl	Loading ...
fileannotate.tmpl	Loading ...
filediff.tmpl	Loading ...
graph.tmpl	Loading ...
graphedge.tmpl	Loading ...
graphnode.tmpl	Loading ...
index.tmpl	Loading ...
logentry.tmpl	Loading ...
manifest.tmpl	Loading ...
map	Loading ...
notfound.tmpl	Loading ...
search.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