hgbook

diff en/examples/branch-named.update-bar.out @ 254:7301e64c362e

find changesets by author, revision, files, or words in the commit message
Chris Mason's "rej" tool has been superseded by "mpatch", per David Rushby.
author Bryan O'Sullivan <bos@serpentine.com>
date Wed May 30 22:18:04 2007 -0700 (2007-05-30)
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	Wed May 30 22:18:04 2007 -0700
     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