view en/examples/tour.merge.update.out @ 515:15bf7d50b586

Translated a couple of paragraphs
author jerojasro@devnull.li
date Wed, 12 Nov 2008 22:36:35 -0500
parents 1b52bda675d0
children
line wrap: on
line source

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