Commits

zhaopingsun committed 3525c20

3.1.3 first 2 paras zh translated

  • Participants
  • Parent commits 199c1c7

Comments (0)

Files changed (1)

 "heads, which is reflected in both the output of <command role=\"hg-cmd\">hg "
 "parents</command> and the contents of <filename>hello.c</filename>."
 msgstr ""
+"我们解析了<filename>hello.c</filename>的内容。这个操作更新了工作目录,使其包含"
+"了<emphasis>两个</emphasis>领头版本的变更,这反映在<command role=\"hg-cmd"
+"\">hg parents</command>的输出和<filename>hello.c</filename>的内容上。"
 
 #. type: Content of: <book><chapter><sect1><sect2><title>
 #: ../en/ch03-tour-merge.xml:151
 "will display two parents until we <command role=\"hg-cmd\">hg commit</"
 "command> the results of the merge."
 msgstr ""
+"当我们完成合并,并通过<command role=\"hg-cmd\">hg commit</command>提交合并的结"
+"果之前,<command role=\"hg-cmd\">hg parents</command>命令都会显示当前版本有两"
+"个父版本。"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch03-tour-merge.xml:160