##// 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
Dan Villiom Podlaski Christiansen - - Load All Authors

File last commit:

r9999:f91e5630 default
r49599:6ae3c97a default
Show More
header.tmpl
1 line | 86 B | application/x-cheetah | CheetahLexer
/ mercurial / templates / atom / header.tmpl
History | Annotation | Raw |Copy content |Copy permalink
<?xml version="1.0" encoding="{encoding}"?>
<feed xmlns="http://www.w3.org/2005/Atom">