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

simplemerge: move printing of merge result to extension...

simplemerge: move printing of merge result to extension The `mercurial.simplemerge` module still has some command-lines processing that doesn't belong in such a low-level module. This patch moves the handling of `hg simplemerge --print` to the extension by having `mercurial.simplemerge.simplemerge()` return the merged text. Differential Revision: https://phab.mercurial-scm.org/D12148

Martin von Zweigbergk -


            r49599:6ae3c97a

default

Name	Size	Modified	Last Commit	Author
/ mercurial / templates / static
__init__.py	Loading ...
background.png	Loading ...
coal-file.png	Loading ...
coal-folder.png	Loading ...
feed-icon-14x14.png	Loading ...
followlines.js	Loading ...
hgicon.png	Loading ...
hglogo.png	Loading ...
mercurial.js	Loading ...
style-extra-coal.css	Loading ...
style-gitweb.css	Loading ...
style-monoblue.css	Loading ...
style-paper.css	Loading ...
style.css	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