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

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

simplemerge: make minimize() a free function...
simplemerge: make minimize() a free function IMO, `Merge3Text` should be about merging text without knowing about conflict markers. "Conflict minimization" is about making conflict markers smaller, so it should be moved out. This patch does that. I'll refactor it next. Differential Revision: https://phab.mercurial-scm.org/D11980
Jeff Sickel - - Load All Authors

File last commit:

r19617:ba89c387 default
r49412:ad0c6bf6 default
Show More
9diff.rc
7 lines | 192 B | text/x-stsrc | TextLexer
/ contrib / plan9 / hgrc.d / 9diff.rc
History | Source | Raw |Copy content |Copy permalink
Steven Stallion
plan9: finalize documentation for next release
 r16442 # The 9diff extdiff command generates diff(1) compatible output
# suitable for use with the plumber(4).
Steven Stallion
plan9: initial support for plan 9 from bell labs...
 r16383 [extensions]
extdiff =
[extdiff]
Jeff Sickel
hgrc.d: separate namespace for mercurial scripts 9diff and 9mail
 r19617 9diff = /bin/mercurial/9diff -cm $parent $child $root