hgbook: en/examples/cmdref.diff-p.out annotate

hgbook

Merge.

author	Bryan O'Sullivan <bos@serpentine.com>
date	Mon Mar 26 23:21:12 2007 -0700 (2007-03-26)
parents
children	c4d24e64ec1f

rev	line source
bos@144	1 $ \textbf{echo '[diff]' >> $HGRC}
bos@144	2 $ \textbf{echo 'showfunc = False' >> $HGRC}
bos@144	3 $ \textbf{hg diff}
bos@144	4 diff -r myfile.c
bos@144	5
bos@144	6
bos@144	7 @@ -1,4 +1,4 @@
bos@144	8 int myfunc()
bos@144	9 \{
bos@144	10 - return 1;
bos@144	11 + return 10;
bos@144	12 \}
bos@144	13 $ \textbf{hg diff -p}
bos@144	14 diff -r myfile.c
bos@144	15
bos@144	16
bos@144	17 @@ -1,4 +1,4 @@ int myfunc()
bos@144	18 int myfunc()
bos@144	19 \{
bos@144	20 - return 1;
bos@144	21 + return 10;
bos@144	22 \}