##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

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
Show More
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 ...