view en/examples/tour.merge.update.out @ 373:250ae1785828

finished collab.tex
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Wed, 17 Dec 2008 20:17:55 +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