hgbook

diff ja/examples/cmdref.diff-p.out @ 980:c40dac4f63d8

merge with Jean Marie Clément
author Romain PELISSE <belaran@gmail.com>
date Fri Sep 04 18:55:53 2009 +0200 (2009-09-04)
parents
children
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/ja/examples/cmdref.diff-p.out	Fri Sep 04 18:55:53 2009 +0200
     1.3 @@ -0,0 +1,22 @@
     1.4 +$ \textbf{echo '[diff]' >> $HGRC}
     1.5 +$ \textbf{echo 'showfunc = False' >> $HGRC}
     1.6 +$ \textbf{hg diff}
     1.7 +diff -r  myfile.c
     1.8 +
     1.9 +
    1.10 +@@ -1,4 +1,4 @@
    1.11 + int myfunc()
    1.12 + \{
    1.13 +-    return 1;
    1.14 ++    return 10;
    1.15 + \}
    1.16 +$ \textbf{hg diff -p}
    1.17 +diff -r  myfile.c
    1.18 +
    1.19 +
    1.20 +@@ -1,4 +1,4 @@ int myfunc()
    1.21 + int myfunc()
    1.22 + \{
    1.23 +-    return 1;
    1.24 ++    return 10;
    1.25 + \}