hgbook

view en/examples/tour.merge.update.out @ 394:b286919e0d61

merged changes from Igor
author Javier Rojas <jerojasro@devnull.li>
date Mon Nov 03 21:04:25 2008 -0500 (2008-11-03)
parents 006bbad1f190
children
line source
1 $ \textbf{hg update}
2 abort: crosses branches (use 'hg merge' or 'hg update -C')