hgbook
diff ja/examples/branch-named.update-bar.out @ 862:ad6d3f5245e7
Link back to the original English version of the book.
author | gpiancastelli |
---|---|
date | Fri Aug 28 12:21:45 2009 +0200 (2009-08-28) |
parents | |
children |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/ja/examples/branch-named.update-bar.out Fri Aug 28 12:21:45 2009 +0200 1.3 @@ -0,0 +1,4 @@ 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