hgbook

view en/examples/tour.merge.update.out @ 491:795f2964e104

translated section 13.4
author Javier Rojas <jerojasro@devnull.li>
date Wed Jan 07 22:26:07 2009 -0500 (2009-01-07)
parents 006bbad1f190
children
line source
1 $ \textbf{hg update}
2 abort: crosses branches (use 'hg merge' or 'hg update -C')