view en/examples/tour.merge.update.out @ 647:5ffee9123bbf

Fix most remaining examples
author Bryan O'Sullivan <bos@serpentine.com>
date Thu, 29 Jan 2009 22:46:56 -0800
parents 1b52bda675d0
children
line wrap: on
line source

$ \textbf{hg update}
abort: crosses branches (use 'hg merge' or 'hg update -C')