zhaopingsun avatar zhaopingsun committed 2f6d4ec

5.6.1 zh translated

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 ""
+"如果Mercurial在合并后发现<emphasis>任何</emphasis>文件处于未解决状态,它会认为"
+"这次合并失败。幸运的是,我们不需要再次从头开始进行合并。"
 
 #. 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 "
 "fail."
 msgstr ""
+"在<command role=\"hg-cmd\">hg resolve</command>的输出中,已经解决的文件标识为"
+"<literal>R</literal>,而未解决文件标识为<literal>U</literal>。  如果有任何文件"
+"被标识为<literal>U</literal>,那么我们就不能提交合并的结果。"
 
 #. type: Content of: <book><chapter><sect1><sect2><title>
 #: ../en/ch05-daily.xml:657
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.