zhaopingsun  committed 2f6d4ec

5.6.1 zh translated

  • Participants
  • Parent commits f5e46bc
  • Branches default

Comments (0)

Files changed (1)

 "a merge, it considers the merge to have failed.  Fortunately, we do not need "
 "to restart the entire merge from scratch."
 msgstr ""
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch05-daily.xml:641
 "resolve\">-l</option> option to <command role=\"hg-cmd\">hg resolve</command> "
 "prints out the state of each merged file."
 msgstr ""
+"<command role=\"hg-cmd\">hg resolve</command>的<option role=\"hg-opt-resolve"
+"\">--list</option>或者<option role=\"hg-opt-resolve\">-l</option>选项会打印出"
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch05-daily.xml:648
 "literal>, we know that an attempt to commit the results of the merge will "
 msgstr ""
+"在<command role=\"hg-cmd\">hg resolve</command>的输出中,已经解决的文件标识为"
+"<literal>R</literal>,而未解决文件标识为<literal>U</literal>。  如果有任何文件"
 #. type: Content of: <book><chapter><sect1><sect2><title>
 #: ../en/ch05-daily.xml:657