Commits

zhaopingsun committed 1bf1631

3.1.3 zh translated

  • Participants
  • Parent commits ef0d54c

Comments (0)

Files changed (1)

 "directory has two parent changesets, and these become the parents of the new "
 "changeset."
 msgstr ""
+"图<xref linkend=\"fig:tour-merge:merge\"/>显示了在合并过程中,工作目录中发生了"
+"什么,还有当提交发生的时候,它是如何影响版本库的。在合并过程中,当前目录有两个"
+"父变更集,他们都成为新的变更集的父版本。"
 
 #. type: Content of: <book><chapter><sect1><sect2><figure><title>
 #: ../en/ch03-tour-merge.xml:176
 "directory was at e.g. revision 5 before we began a merge, that revision will "
 "become the left side of the merge."
 msgstr ""
+"我们有时候说合并有<emphasis>两边</emphasis>:左边是<command role=\"hg-cmd"
+"\">hg parents</command>命令输出的第一个父版本,右边是第二个。如上例所示,如果"
+"在合并前版本号是5,那么它就会成为合并的左边。 "
 
 #. type: Content of: <book><chapter><sect1><title>
 #: ../en/ch03-tour-merge.xml:196