view en/examples/tour.merge.update.out @ 378:5530934319b8

compile fix
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Fri, 09 Jan 2009 23:05:26 +0900
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