Mercurial > hgbook

view en/examples/tour.merge.update.out @ 427:b7d284121f21

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge from somewhere else
author jerojasro@localhost
date Thu, 16 Oct 2008 23:25:41 -0500
parents 1b52bda675d0
children
line wrap: on
line source

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