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

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

simplemerge: remove code for checking binary input now that callers do it...
simplemerge: remove code for checking binary input now that callers do it The callers now do the checking for binary inputs and handle warnings and/or errors, so we can remove that code from the low-level `simplemerge` module now. After this patch we just raise an error unless the caller told us to allow binary inputs. Differential Revision: https://phab.mercurial-scm.org/D12169
Jeff Sickel - - Load All Authors

File last commit:

r19617:ba89c387 default
r49598:d9602f0d 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