hgbook

diff en/examples/branch-named.update-bar.out @ 408:56914d368af4

find changesets by author, revision, files, or words in the commit message
Finished translation of intro to spanish
author Igor TAmara <igor@tamarapatino.org>
date Sun Nov 09 21:49:16 2008 -0500 (2008-11-09)
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	Sun Nov 09 21:49:16 2008 -0500
     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