Mercurial > hgbook
annotate en/examples/results/extdiff.diff.out @ 688:4bb10cfa3812
Make actual use of the preface.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Thu, 26 Mar 2009 19:58:09 -0700 |
parents | 0d5935744f87 |
children | 4432ad34b8e5 |
rev | line source |
---|---|
663
0d5935744f87
Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents:
662
diff
changeset
|
1 <screen><prompt>$</prompt> <userinput>hg diff</userinput> |
226
eef2171243e8
Document the extdiff extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
2 diff -r myfile |
eef2171243e8
Document the extdiff extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
3 |
eef2171243e8
Document the extdiff extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
4 |
404
ef34f7bec749
Fix sample output for 'extdiff' test.
Guido Ostkamp <hg@ostkamp.fastmail.fm>
parents:
226
diff
changeset
|
5 @@ -1,1 +1,2 @@ |
226
eef2171243e8
Document the extdiff extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
6 The first line. |
eef2171243e8
Document the extdiff extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
7 +The second line. |
663
0d5935744f87
Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents:
662
diff
changeset
|
8 </screen> |