view en/examples/tour.merge.update.out @ 459:d4a0d7488a08

Merged jerojasro changes
author Igor TAmara <igor@tamarapatino.org>
date Sat, 25 Oct 2008 17:29:33 -0500
parents 1b52bda675d0
children
line wrap: on
line source

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