hgbook

diff it/examples/branch-named.merge.it @ 1078:708f570346a9

find changesets by author, revision, files, or words in the commit message
2.4.1 some para zh translated
author Zhaoping Sun <zhaopingsun@gmail.com>
date Wed Nov 18 22:22:34 2009 -0500 (2009-11-18)
parents 7252e7b7f07d
children 719b03ea27c8
line diff
     1.1 --- a/it/examples/branch-named.merge.it	Fri Aug 21 22:29:44 2009 +0200
     1.2 +++ b/it/examples/branch-named.merge.it	Wed Nov 18 22:22:34 2009 -0500
     1.3 @@ -4,7 +4,7 @@
     1.4  <prompt>$</prompt> <userinput>hg merge foo</userinput>
     1.5  1 file aggiornati, 0 file uniti, 0 file rimossi, 0 file irrisolti
     1.6  (unione tra rami, ricordatevi di effettuare il commit)
     1.7 -<prompt>$</prompt> <userinput>hg commit -m 'Unione.'</userinput>
     1.8 +<prompt>$</prompt> <userinput>hg commit -m "Unione."</userinput>
     1.9  <prompt>$</prompt> <userinput>hg tip</userinput>
    1.10  changeset:   4:f50f493d0dc0
    1.11  ramo:        bar