Mercurial > hgbook

annotate en/examples/extdiff.diff.out @ 427:b7d284121f21

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge from somewhere else
author jerojasro@localhost
date Thu, 16 Oct 2008 23:25:41 -0500
parents ef34f7bec749
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
226
eef2171243e8 Document the extdiff extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
1 $ \textbf{hg diff}
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.