hgbook

diff ja/examples/tour.merge.update.out @ 709:f9f71850ae1a

find changesets by author, revision, files, or words in the commit message
Merge with foozy
author Bryan O'Sullivan <bos@serpentine.com>
date Fri Aug 14 12:10:47 2009 -0700 (2009-08-14)
parents
children
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/ja/examples/tour.merge.update.out	Fri Aug 14 12:10:47 2009 -0700
     1.3 @@ -0,0 +1,2 @@
     1.4 +$ \textbf{hg update}
     1.5 +abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes