hgbook

annotate en/examples/extdiff.extdiff-ctx.out @ 356:0db175abfaf3

some friggin' merge or something like that.
author jerojasro@localhost
date Tue Oct 21 22:41:51 2008 -0500 (2008-10-21)
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.