hgbook

diff en/examples/tour.merge.update.out @ 299:2936cb7eae7a

find changesets by author, revision, files, or words in the commit message
Fix sample output for test 'branch-named'.
author Guido Ostkamp <hg@ostkamp.fastmail.fm>
date Wed Aug 20 21:55:35 2008 +0200 (2008-08-20)
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 Aug 20 21:55:35 2008 +0200
     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