hgbook
diff en/examples/branch-named.update-bar.out @ 259:b42689a730a2
Typo
author | Johannes Hoff <wbunaarfubss@gmail.com> |
---|---|
date | Sun Jun 17 11:42:14 2007 +0200 (2007-06-17) |
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 Sun Jun 17 11:42:14 2007 +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