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

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

simplemerge: change _minimize() to minimize a single conflict...
simplemerge: change _minimize() to minimize a single conflict `_minimize()` is weird in that it changes `a_lines` and `b_lines` but leaves `base_lines` unchanged, which means they'll be inconsistent. That was fine because the caller never used `base_lines`. With the recent refactorings of this code, we can now make this function cleaner by having it minimize a single conflict and not care about `base_lines`. This also makes the code simpler and makes the code for each `render_*()` function more similar. Differential Revision: https://phab.mercurial-scm.org/D11981
Jeff Sickel - - Load All Authors

File last commit:

r19617:ba89c387 default
r49413:c2537aec default
Show More
9mail.rc
4 lines | 97 B | text/x-stsrc | TextLexer
/ contrib / plan9 / hgrc.d / 9mail.rc
History | Source | Raw |Copy content |Copy permalink
Jeff Sickel
hgrc.d: separate namespace for mercurial scripts 9diff and 9mail
 r19617 # The 9mail to support patchbomb and other email wrappers
[email]
method = /bin/mercurial/9mail