hgbook
diff en/examples/branch-named.update-bar.out @ 559:b90b024729f1
WIP DocBook snapshot that all compiles. Mirabile dictu!
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Wed Feb 18 00:22:09 2009 -0800 (2009-02-18) |
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 Wed Feb 18 00:22:09 2009 -0800 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