hgbook
diff en/examples/branch-named.update-bar.out @ 549:bc14f94e726a
Check in a known-broken example to fix up later - XXX
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Thu Jan 29 22:47:34 2009 -0800 (2009-01-29) |
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 Thu Jan 29 22:47:34 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