hgbook

diff en/examples/tour.merge.pull.out @ 425:2b4022f9e3f8

translated 2 paragraphs
author Javier Rojas <jerojasro@devnull.li>
date Fri Nov 21 00:07:44 2008 -0500 (2008-11-21)
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	Fri Nov 21 00:07:44 2008 -0500
     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)