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.

#!/bin/sh
hg --debug init
echo this is a1 > a
hg add a
hg commit -m0 -d "1000000 0"
echo this is b1 > b
hg add b
hg commit -m1 -d "1000000 0"
hg manifest 1
echo this is c1 > c
hg rawcommit -p 1 -d "1000000 0" -m2 c
hg manifest 2
hg parents
rm b
hg rawcommit -p 2 -d "1000000 0" -m3 b
hg manifest 3
hg parents
echo this is a22 > a
hg rawcommit -p 3 -d "1000000 0" -m4 a
hg manifest 4
hg parents
echo this is c22 > c
hg rawcommit -p 1 -d "1000000 0" -m5 c
hg manifest 5
hg parents
# merge, but no files changed
hg rawcommit -p 4 -p 5 -d "1000000 0" -m6
hg manifest 6
hg parents
# no changes what-so-ever
hg rawcommit -p 6 -d "1000000 0" -m7
hg manifest 7
hg parents