view en/examples/results/tour.merge.update.out @ 668:60ee738fdc0e

Fix quoting of entity declarations.
author Bryan O'Sullivan <bos@serpentine.com>
date Mon, 09 Mar 2009 23:32:15 -0700
parents 0d5935744f87
children 4432ad34b8e5
line wrap: on
line source

<screen><prompt>$</prompt> <userinput>hg update</userinput>
abort: crosses branches (use 'hg merge' or 'hg update -C')
</screen>