hgbook
diff en/examples/tour.merge.update.out @ 956:61f7bf2e562d
review of french tour-basic
author | Wilk |
---|---|
date | Sun Feb 22 16:15:40 2009 +0100 (2009-02-22) |
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 Sun Feb 22 16:15:40 2009 +0100 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')