view en/examples/tour.merge.update.out @ 227:9be45345065a

Make test more robust.
author Bryan O'Sullivan <bos@serpentine.com>
date Sat, 26 May 2007 12:00:09 -0700
parents 006bbad1f190
children 1b52bda675d0
line wrap: on
line source

$ \textbf{hg update}
abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes