hgbook

diff en/examples/tour.merge.update.out @ 289:7be02466421b

find changesets by author, revision, files, or words in the commit message
Oops, forgot to update the output
author Bryan O'Sullivan <bos@serpentine.com>
date Fri Jan 18 12:05:01 2008 -0800 (2008-01-18)
parents
children 1b52bda675d0
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/en/examples/tour.merge.update.out	Fri Jan 18 12:05:01 2008 -0800
     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