hgbook

diff ja/examples/branch-named.update-bar.out @ 980:c40dac4f63d8

find changesets by author, revision, files, or words in the commit message
merge with Jean Marie Clément
author Romain PELISSE <belaran@gmail.com>
date Fri Sep 04 18:55:53 2009 +0200 (2009-09-04)
parents
children
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/ja/examples/branch-named.update-bar.out	Fri Sep 04 18:55:53 2009 +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