hgbook

annotate en/examples/tour.merge.update.out @ 272:74c079e0051f

Account for change in bisect output.
author Bryan O'Sullivan <bos@serpentine.com>
date Mon Nov 26 11:18:46 2007 -0800 (2007-11-26)
parents
children 1b52bda675d0
rev   line source
bos@144 1 $ \textbf{hg update}
bos@144 2 abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes