hgbook

diff it/examples/tour.merge.pull.it @ 1042:b08a63383d04

find changesets by author, revision, files, or words in the commit message
1.6.1 2 para translated
author zhaopingsun
date Mon Nov 09 21:53:10 2009 -0500 (2009-11-09)
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	Mon Nov 09 21:53:10 2009 -0500
     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