Mercurial > hgbook

annotate en/examples/extdiff.extdiff-ctx.out @ 484:0abd3d78172e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
finished translation of a figure translated a few paragraphs of tour-merge
author Javier Rojas <jerojasro@devnull.li>
date Sun, 02 Nov 2008 13:54:42 -0500
parents 00f69e8825c5
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 extdiff -o -NprcC5}
273
00f69e8825c5 Bring book up to date with recent changes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 226
diff changeset
2
226
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 ***************
eef2171243e8 Document the extdiff extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
5 *** 1 ****
eef2171243e8 Document the extdiff extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
6
eef2171243e8 Document the extdiff extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
7 The first line.
eef2171243e8 Document the extdiff extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
8 + The second line.