hgbook

view ja/examples/tour.merge.update.out @ 963:1dd00abb3fa9

find changesets by author, revision, files, or words in the commit message
merge with bryan - it's been a while but everything seems ok
author Romain PELISSE <belaran@gmail.com>
date Sun Aug 16 03:41:39 2009 +0200 (2009-08-16)
parents
children
line source
1 $ \textbf{hg update}
2 abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes