hgbook

annotate ja/examples/tour.merge.update.out @ 999:a6b81cd31cfd

find changesets by author, revision, files, or words in the commit message
adding complete.xml - which generated but Bryan did add it also - as I have absolutly no personnality I do as he does
author Romain PELISSE <belaran@gmail.com>
date Sat Sep 12 20:53:36 2009 +0200 (2009-09-12)
parents
children
rev   line source
foozy@708 1 $ \textbf{hg update}
foozy@708 2 abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes