Mercurial > hg
annotate contrib/plan9/hgrc.d/9diff.rc @ 20327:46c2331fc750 stable
rebase: abort cleanly when we encounter a damaged rebasestate (issue4155)
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 30 Jan 2014 13:56:56 -0600 |
parents | ba89c3872801 |
children |
rev | line source |
---|---|
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 |