hgbook

view it/examples/tour.merge.update.it @ 1113:613690ad6a9c

find changesets by author, revision, files, or words in the commit message
Merge with dongsheng
author Bryan O'Sullivan <bos@serpentine.com>
date Sat Jul 10 16:21:26 2010 +0100 (2010-07-10)
parents 713f0f69029a d511cb890aa9
children
line source
1 <!-- BEGIN tour.merge.update -->
2 <screen><prompt>$</prompt> <userinput>hg update</userinput>
3 fallimento: attraversa i rami (usate 'hg merge' o 'hg update -C')
4 </screen>
5 <!-- END tour.merge.update -->