view en/examples/results/tour.merge.update.out @ 662:44d1363234d2

Move example output files into examples/results
author Bryan O'Sullivan <bos@serpentine.com>
date Mon, 09 Mar 2009 21:37:47 -0700
parents en/examples/tour.merge.update.out@1b52bda675d0
children 0d5935744f87
line wrap: on
line source

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