hgbook

diff en/examples/branch-named.update-bar.out @ 959:b3cb66d935cf

find changesets by author, revision, files, or words in the commit message
Finished tour-merge.tex
author Romain PELISSE <belaran@gmail.com>
date Mon Feb 23 23:53:18 2009 +0100 (2009-02-23)
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	Mon Feb 23 23:53:18 2009 +0100
     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