hgbook

diff it/examples/issue29.go.it @ 1107:56dbd7295704

find changesets by author, revision, files, or words in the commit message
2.8.3 first 3 para zh translated
author Zhaoping Sun <zhaopingsun@gmail.com>
date Wed Dec 23 23:02:50 2009 -0500 (2009-12-23)
parents 3d5e63d5d180
children 719b03ea27c8
line diff
     1.1 --- a/it/examples/issue29.go.it	Tue Aug 11 21:53:03 2009 +0200
     1.2 +++ b/it/examples/issue29.go.it	Wed Dec 23 23:02:50 2009 -0500
     1.3 @@ -15,6 +15,6 @@
     1.4  aggiungo b/b
     1.5  creata una nuova testa
     1.6  <prompt>$</prompt> <userinput>hg merge</userinput>
     1.7 -fallimento: è una directory: /tmp/problema29jbjGH5/problema29/b
     1.8 +fallimento: è una directory: /tmp/problema29/b
     1.9  </screen>
    1.10  <!-- END issue29.go -->