hgbook

diff en/examples/tour.merge.update.out @ 246:8c15549666fa

find changesets by author, revision, files, or words in the commit message
Fix another typo, courtesy of Tim Hatch.
author Bryan O'Sullivan <bos@serpentine.com>
date Wed May 30 09:03:12 2007 -0700 (2007-05-30)
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	Wed May 30 09:03:12 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