Mercurial > hgbook

view en/examples/tour.merge.update.out @ 192:06ab90119fa6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Be more conservative in timeouts. Needed on my new, slower (!?) laptop.
author Bryan O'Sullivan <bos@serpentine.com>
date Mon, 16 Apr 2007 14:39:51 -0700
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