view en/examples/tour.merge.update.out @ 405:1b52bda675d0

Fix sample output for 'tour' test.
author Guido Ostkamp <hg@ostkamp.fastmail.fm>
date Wed, 20 Aug 2008 22:08:24 +0200
parents 006bbad1f190
children
line wrap: on
line source

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