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

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

simplemerge: store input data in MergeInput...
simplemerge: store input data in MergeInput I want to be able to update the file contents for support for partial conflict resolution. Having the text available (and later settable) on `MergeInput` will enable that. Differential Revision: https://phab.mercurial-scm.org/D12144
Jeff Sickel - - Load All Authors

File last commit:

r19617:ba89c387 default
r49595:59c6724d 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