hgbook

diff en/examples/tour.merge.update.out @ 230:f83281da4122

find changesets by author, revision, files, or words in the commit message
Add new commands for commands and options provided by extensions.
Should improve indexing a bit.
author Bryan O'Sullivan <bos@serpentine.com>
date Sun May 27 09:39:27 2007 -0700 (2007-05-27)
parents
children 1b52bda675d0
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/en/examples/tour.merge.update.out	Sun May 27 09:39:27 2007 -0700
     1.3 @@ -0,0 +1,2 @@
     1.4 +$ \textbf{hg update}
     1.5 +abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes