annotate ja/examples/extdiff.extdiff-ctx.out @ 803:5276f40fca1c

Propagate e6c99cbd0abd Updates to chapters 5, 6, and 7
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Thu, 09 Jul 2009 13:32:44 +0900
parents b0db5adf11c1
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.