Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-git-import.out @ 2901:05f357b70cb0
Tune a bit the extdiff toplevel comments/samples.
* Capitalize the first letter of all sentences
* Add an example for GNU diff(1) 'context diff' mode.
* Explain the requirement for separate cmd.xxx and opts.xxx
options in .hgrc, which hopefully will guard against users
trying to add:
[extdiff]
# Add a new Mercurial command called `cdiff', which calls
# GNU diff(1) in 'context diff' mode.
cmd.cdiff = diff -Nprc5
which fails for recent crew builds with:
$ hg cdiff .
making snapshot of 1 files from rev 07dc4a569f4e
making snapshot of 1 files from working dir
diff -Nprc5: not found
The correct way to do this is by separating the cmd.cdiff and
opts.cdiff parts like this:
[extdiff]
# Add a new Mercurial command called `cdiff', which calls
# GNU diff(1) in 'context diff' mode.
cmd.cdiff = diff
opts.cdiff = -Nprc5
so add it as a new example and explicitly describe it in the
extdiff comments.
author | Giorgos Keramidas <keramida@ceid.upatras.gr> |
---|---|
date | Tue, 15 Aug 2006 18:14:58 +0300 |
parents | e2b69dbb2daa |
children | b70740aefa4d |
line wrap: on
line source
% new file applying patch from stdin patching file new % chmod +x applying patch from stdin % copy applying patch from stdin a a % rename applying patch from stdin copyx new rename % delete applying patch from stdin patching file copyx new rename % regular diff applying patch from stdin patching file rename % copy and modify applying patch from stdin patching file copy2 a a b a a % rename and modify applying patch from stdin patching file rename2 copy2: No such file or directory a a b c a