hgbook

annotate en/examples/tour.merge.update.out @ 356:0db175abfaf3

find changesets by author, revision, files, or words in the commit message
some friggin' merge or something like that.
author jerojasro@localhost
date Tue Oct 21 22:41:51 2008 -0500 (2008-10-21)
parents 006bbad1f190
children
rev   line source
bos@144 1 $ \textbf{hg update}
hg@306 2 abort: crosses branches (use 'hg merge' or 'hg update -C')