hgbook

view en/examples/tour.merge.update.out @ 946:1f2044943861

Oops, overwrite some of my translation by adding Hugues works... Corrected.
author Romain PELISSE <belaran@gmail.com>
date Mon Feb 16 18:51:52 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')