hgbook
diff en/examples/branch-named.update-bar.out @ 320:97e929385442
Small typos, plus a perl regexp match. It was stripping newlines!
author | Taavi Burns <taavi@taaviburns.ca> |
---|---|
date | Sun Aug 31 12:14:23 2008 -0400 (2008-08-31) |
parents | 6519f3b983b4 |
children |
line diff
1.1 --- a/en/examples/branch-named.update-bar.out Mon Apr 23 15:28:13 2007 -0700 1.2 +++ b/en/examples/branch-named.update-bar.out Sun Aug 31 12:14:23 2008 -0400 1.3 @@ -1,4 +1,2 @@ 1.4 $ \textbf{hg update bar} 1.5 -abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes 1.6 -$ \textbf{hg update -C bar} 1.7 1 files updated, 0 files merged, 1 files removed, 0 files unresolved