Mercurial > hgbook
annotate ja/examples/cmdref.diff-p.out @ 838:d1f676a6a4b3 default tip
update mq chapter.
propagate ef53d025f410.
author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
---|---|
date | Thu, 03 Dec 2009 01:26:08 +0900 |
parents | b0db5adf11c1 |
children |
rev | line source |
---|---|
144
006bbad1f190
Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
1 $ \textbf{echo '[diff]' >> $HGRC} |
006bbad1f190
Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
2 $ \textbf{echo 'showfunc = False' >> $HGRC} |
006bbad1f190
Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
3 $ \textbf{hg diff} |
006bbad1f190
Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
4 diff -r myfile.c |
006bbad1f190
Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
5 |
006bbad1f190
Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
6 |
006bbad1f190
Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
7 @@ -1,4 +1,4 @@ |
006bbad1f190
Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
8 int myfunc() |
006bbad1f190
Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
9 \{ |
006bbad1f190
Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
10 - return 1; |
006bbad1f190
Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
11 + return 10; |
006bbad1f190
Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
12 \} |
006bbad1f190
Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
13 $ \textbf{hg diff -p} |
006bbad1f190
Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
14 diff -r myfile.c |
006bbad1f190
Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
15 |
006bbad1f190
Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
16 |
006bbad1f190
Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
17 @@ -1,4 +1,4 @@ int myfunc() |
006bbad1f190
Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
18 int myfunc() |
006bbad1f190
Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
19 \{ |
006bbad1f190
Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
20 - return 1; |
006bbad1f190
Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
21 + return 10; |
006bbad1f190
Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
22 \} |