contrib/plan9/hgrc.d/9diff.rc
author Martin von Zweigbergk <martinvonz@google.com>
Sat, 31 Mar 2018 23:37:25 -0700
changeset 37251 7c0f40f4f7bf
parent 19617 ba89c3872801
permissions -rw-r--r--
scmutil: introduce deprecated alias for revpair() revsingle() returns a context object, revpair() returns nodeids, revrange() returns integer revisions (in a revset). I'm going to reduce this inconsistency by making revpair() return context objects. Changing the return type is not nice to extensions, so this patch introduces a nodeid-returning version of revpair() that they can detect and use. Update callers to the new function so we can change revpair() itself and then migrate them back one by one. Differential Revision: https://phab.mercurial-scm.org/D3005
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
16442
9181188ffb5b plan9: finalize documentation for next release
Steven Stallion <sstallion@gmail.com>
parents: 16383
diff changeset
     1
# The 9diff extdiff command generates diff(1) compatible output
9181188ffb5b plan9: finalize documentation for next release
Steven Stallion <sstallion@gmail.com>
parents: 16383
diff changeset
     2
# suitable for use with the plumber(4).
16383
f5dd179bfa4a plan9: initial support for plan 9 from bell labs
Steven Stallion <sstallion@gmail.com>
parents:
diff changeset
     3
[extensions]
f5dd179bfa4a plan9: initial support for plan 9 from bell labs
Steven Stallion <sstallion@gmail.com>
parents:
diff changeset
     4
extdiff =
f5dd179bfa4a plan9: initial support for plan 9 from bell labs
Steven Stallion <sstallion@gmail.com>
parents:
diff changeset
     5
f5dd179bfa4a plan9: initial support for plan 9 from bell labs
Steven Stallion <sstallion@gmail.com>
parents:
diff changeset
     6
[extdiff]
19617
ba89c3872801 hgrc.d: separate namespace for mercurial scripts 9diff and 9mail
Jeff Sickel <jas@corpus-callosum.com>
parents: 16442
diff changeset
     7
9diff = /bin/mercurial/9diff -cm $parent $child $root