Mercurial Mercurial > hg-stable / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
contrib/plan9/hgrc.d/9diff.rc
author Siddharth Agarwal <sid0@fb.com>
Mon, 30 Nov 2015 10:26:37 -0800
changeset 27134 cb5bdf65420f
parent 19617 ba89c3872801
permissions -rw-r--r--
debugmergestate: print out null nodes as 'null' This is so much easier to read than a long string of zeroes, and we're going to have a lot more of these nodes once change/delete conflicts are part of the merge state.
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















hg-stable