hgbook

annotate en/examples/tour.merge.update.out @ 163:a342a44e5e66

find changesets by author, revision, files, or words in the commit message
Deal with new hg command output.
author Bryan O'Sullivan <bos@serpentine.com>
date Mon Mar 26 22:27:03 2007 -0700 (2007-03-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