Mercurial > hgbook
view en/examples/tour.merge.update.out @ 563:951bf84ca8e2
translated up to the section "testing and troubleshooting"
author | Javier Rojas <jerojasro@devnull.li> |
---|---|
date | Tue, 23 Dec 2008 18:57:35 -0500 |
parents | 1b52bda675d0 |
children |
line wrap: on
line source
$ \textbf{hg update} abort: crosses branches (use 'hg merge' or 'hg update -C')