hgbook

view en/examples/tour.merge.update.out @ 549:bc14f94e726a

find changesets by author, revision, files, or words in the commit message
Check in a known-broken example to fix up later - XXX
author Bryan O'Sullivan <bos@serpentine.com>
date Thu Jan 29 22:47:34 2009 -0800 (2009-01-29)
parents 006bbad1f190
children
line source
1 $ \textbf{hg update}
2 abort: crosses branches (use 'hg merge' or 'hg update -C')