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

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

mergestate: add accessors for local and other nodeid, not just contexts...
mergestate: add accessors for local and other nodeid, not just contexts The mergestate can contain invalid nodeids. In that case, `mergestate.localctx` or `mergestate.otherctx` will fail. This patch provides a way of accessing the nodeid without failing in such cases. Differential Revision: https://phab.mercurial-scm.org/D8040
Jeff Sickel - - Load All Authors

File last commit:

r19617:ba89c387 default
r44696:b1069b36 default
Show More
9diff.rc
7 lines | 192 B | text/x-stsrc | TextLexer
/ contrib / plan9 / hgrc.d / 9diff.rc
History | Annotation | Raw |Copy content |Copy permalink
# The 9diff extdiff command generates diff(1) compatible output
# suitable for use with the plumber(4).
[extensions]
extdiff =
[extdiff]
9diff = /bin/mercurial/9diff -cm $parent $child $root