Mercurial > hgbook

view en/examples/tour.merge.update.out @ 484:0abd3d78172e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
finished translation of a figure translated a few paragraphs of tour-merge
author Javier Rojas <jerojasro@devnull.li>
date Sun, 02 Nov 2008 13:54:42 -0500
parents 1b52bda675d0
children
line wrap: on
line source

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