hgbook
diff it/examples/tour.merge.pull.it @ 850:5bbebcdfb533
You wouldn't believe me if I told you.
author | gpiancastelli |
---|---|
date | Sat Aug 22 18:49:12 2009 +0200 (2009-08-22) |
parents | 0bf0bf61493e |
children | 719b03ea27c8 |
line diff
1.1 --- a/it/examples/tour.merge.pull.it Mon Aug 10 21:59:18 2009 +0200 1.2 +++ b/it/examples/tour.merge.pull.it Sat Aug 22 18:49:12 2009 +0200 1.3 @@ -1,6 +1,6 @@ 1.4 <!-- BEGIN tour.merge.pull --> 1.5 -<screen><prompt>$</prompt> <userinput>hg pull ../my-hello</userinput> 1.6 -estraggo da ../my-hello 1.7 +<screen><prompt>$</prompt> <userinput>hg pull ../mio-hello</userinput> 1.8 +estraggo da ../mio-hello 1.9 cerco i cambiamenti 1.10 aggiungo i changeset 1.11 aggiungo i manifest