hgbook
diff en/examples/branch-named.update-bar.out @ 276:92660e72d6bf
[hgbook] Fix a typo
author | "Dongsheng Song" <dongsheng.song@gmail.com> |
---|---|
date | Fri Dec 07 21:25:07 2007 -0800 (2007-12-07) |
parents | |
children | 2936cb7eae7a |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/en/examples/branch-named.update-bar.out Fri Dec 07 21:25:07 2007 -0800 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