hgbook

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

find changesets by author, revision, files, or words in the commit message
finished translation of a figure

translated a few paragraphs of tour-merge
author Javier Rojas <jerojasro@devnull.li>
date Sun Nov 02 13:54:42 2008 -0500 (2008-11-02)
parents 006bbad1f190
children
line source
1 $ \textbf{hg update}
2 abort: crosses branches (use 'hg merge' or 'hg update -C')