hgbook

view en/examples/results/tour.merge.update.out @ 611:4432ad34b8e5

find changesets by author, revision, files, or words in the commit message
Check in example outputs with begin/end markers.
author Bryan O'Sullivan <bos@serpentine.com>
date Tue Mar 31 12:19:01 2009 -0700 (2009-03-31)
parents 0d5935744f87
children
line source
1 <!-- BEGIN tour.merge.update -->
2 <screen><prompt>$</prompt> <userinput>hg update</userinput>
3 abort: crosses branches (use 'hg merge' or 'hg update -C')
4 </screen>
5 <!-- END tour.merge.update -->