hgbook

diff it/examples/branch-repo.merge.it @ 1109:e1ca493f011d

find changesets by author, revision, files, or words in the commit message
2.8.4 first 2 para zh translated
author Zhaoping Sun <zhaopingsun@gmail.com>
date Wed Dec 23 23:29:17 2009 -0500 (2009-12-23)
parents c35067358254
children 719b03ea27c8
line diff
     1.1 --- a/it/examples/branch-repo.merge.it	Sat Aug 15 03:10:19 2009 +0200
     1.2 +++ b/it/examples/branch-repo.merge.it	Wed Dec 23 23:29:17 2009 -0500
     1.3 @@ -2,7 +2,7 @@
     1.4  <screen><prompt>$</prompt> <userinput>hg merge</userinput>
     1.5  1 file aggiornati, 0 file uniti, 0 file rimossi, 0 file irrisolti
     1.6  (unione tra rami, ricordatevi di eseguire il commit)
     1.7 -<prompt>$</prompt> <userinput>hg commit -m 'Incorpora la correzione dal ramo 1.0.1.'</userinput>
     1.8 +<prompt>$</prompt> <userinput>hg commit -m "Incorpora la correzione dal ramo 1.0.1."</userinput>
     1.9  <prompt>$</prompt> <userinput>hg push</userinput>
    1.10  trasmetto a /tmp/mioprogetto
    1.11  cerco i cambiamenti