hgbook

annotate en/examples/extdiff.extdiff-ctx.out @ 472:6880f9c8e7e7

Automated merge with http://mercurial.intuxication.org/hg/mercurial_book_es
author Igor Támara <igor@tamarapatino.org>
date Sun Dec 28 00:30:26 2008 -0500 (2008-12-28)
parents eef2171243e8
children
rev   line source
bos@226 1 $ \textbf{hg extdiff -o -NprcC5}
bos@273 2
bos@226 3
bos@226 4 ***************
bos@226 5 *** 1 ****
bos@226 6
bos@226 7 The first line.
bos@226 8 + The second line.