Mercurial > hgbook

diff en/examples/branch-named.update-bar.out @ 206:6519f3b983b4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More material about named branches.
author Bryan O'Sullivan <bos@serpentine.com>
date Mon, 23 Apr 2007 15:28:13 -0700
parents
children 2936cb7eae7a
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/branch-named.update-bar.out	Mon Apr 23 15:28:13 2007 -0700
@@ -0,0 +1,4 @@
+$ \textbf{hg update bar}
+abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes
+$ \textbf{hg update -C bar}
+1 files updated, 0 files merged, 1 files removed, 0 files unresolved