hgbook

view en/examples/tour.merge.update.out @ 948:afdc168fa06c

Merge from Hugues and my work
author Romain PELISSE <belaran@gmail.com>
date Mon Feb 16 23:31:14 2009 +0100 (2009-02-16)
parents 006bbad1f190
children
line source
1 $ \textbf{hg update}
2 abort: crosses branches (use 'hg merge' or 'hg update -C')