hgbook

diff en/examples/tour.merge.update.out @ 394:b286919e0d61

find changesets by author, revision, files, or words in the commit message
merged changes from Igor
author Javier Rojas <jerojasro@devnull.li>
date Mon Nov 03 21:04:25 2008 -0500 (2008-11-03)
parents 006bbad1f190
children
line diff
     1.1 --- a/en/examples/tour.merge.update.out	Tue Mar 06 21:44:56 2007 -0800
     1.2 +++ b/en/examples/tour.merge.update.out	Mon Nov 03 21:04:25 2008 -0500
     1.3 @@ -1,2 +1,2 @@
     1.4  $ \textbf{hg update}
     1.5 -abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes
     1.6 +abort: crosses branches (use 'hg merge' or 'hg update -C')