Mercurial > hgbook
view en/examples/tour.merge.update.out @ 395:e0b56f008b09
Fix sample output for 'backout' test.
author | Guido Ostkamp <hg@ostkamp.fastmail.fm> |
---|---|
date | Wed, 20 Aug 2008 21:51:54 +0200 |
parents | 006bbad1f190 |
children | 1b52bda675d0 |
line wrap: on
line source
$ \textbf{hg update} abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes