hgbook

view en/examples/tour.merge.update.out @ 275:96ea24a916f9

find changesets by author, revision, files, or words in the commit message
Merge with myself.
author Bryan O'Sullivan <bos@serpentine.com>
date Mon Nov 26 20:42:36 2007 -0800 (2007-11-26)
parents
children 1b52bda675d0
line source
1 $ \textbf{hg update}
2 abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes