Mercurial > hgbook

view en/examples/tour.merge.update.out @ 275:96ea24a916f9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with myself.
author Bryan O'Sullivan <bos@serpentine.com>
date Mon, 26 Nov 2007 20:42:36 -0800
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