hgbook

annotate en/examples/tour.merge.tip.out @ 192:06ab90119fa6

Be more conservative in timeouts.
Needed on my new, slower (!?) laptop.
author Bryan O'Sullivan <bos@serpentine.com>
date Mon Apr 16 14:39:51 2007 -0700 (2007-04-16)
parents
children
rev   line source
bos@144 1 $ \textbf{hg tip}
bos@144 2 changeset:
bos@144 3 tag: tip
bos@144 4 parent:
bos@144 5 parent:
bos@144 6 user: Bryan O'Sullivan <bos@serpentine.com>
bos@144 7
bos@144 8 summary: Merged changes
bos@144 9