Mercurial > hgbook
view en/examples/tour.merge.update.out @ 521:59fbfb7e790c
translated some more comments
author | Javier Rojas <jerojasro@devnull.li> |
---|---|
date | Mon, 17 Nov 2008 20:04:37 -0500 |
parents | 1b52bda675d0 |
children |
line wrap: on
line source
$ \textbf{hg update} abort: crosses branches (use 'hg merge' or 'hg update -C')