hgbook
diff en/examples/tour.merge.pull.out @ 161:7f07aca44938
Write up the unpleasant effects of change ef1f1a4b2efb in the hg tree.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Mon Mar 26 21:58:24 2007 -0700 (2007-03-26) |
parents | |
children |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/en/examples/tour.merge.pull.out Mon Mar 26 21:58:24 2007 -0700 1.3 @@ -0,0 +1,8 @@ 1.4 +$ \textbf{hg pull ../my-hello} 1.5 +pulling from ../my-hello 1.6 +searching for changes 1.7 +adding changesets 1.8 +adding manifests 1.9 +adding file changes 1.10 +added 1 changesets with 1 changes to 1 files (+1 heads) 1.11 +(run 'hg heads' to see heads, 'hg merge' to merge)