zhaopingsun avatar zhaopingsun committed 8759da8

5.7 part zh translated

Comments (0)

Files changed (1)

 #. type: Content of: <book><chapter><sect1><sect2><title>
 #: ../en/ch05-daily.xml:657
 msgid "Resolving a file merge"
-msgstr "合并文件"
+msgstr "解决文件合并"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch05-daily.xml:659
 "<option role=\"hg-opt-resolve\">-a</option> option, which will retry the "
 "merges of <emphasis>all</emphasis> unresolved files."
 msgstr ""
+"我们有几种方法将文件从未解决状态变成解决状态。至今为止最常用的命令是重新运行"
+"<command role=\"hg-cmd\">hg resolve</command>。如果我们将文件名或者目录名传递"
+"给它,那么它会重新在给定为止合并任何未解决的文件。如果我们将<option role=\"hg-"
+"opt-resolve\">--all</option>或者<option role=\"hg-opt-resolve\">-a</option>选"
+"项传给它,那么它会重新合并<emphasis>所有的</emphasis>未解决文件。"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch05-daily.xml:669
 #. type: Content of: <book><chapter><sect1><title>
 #: ../en/ch05-daily.xml:680
 msgid "More useful diffs"
-msgstr "更有用的差异"
+msgstr "差异的更多技巧"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch05-daily.xml:682
 "is backwards compatible with the regular <command>diff</command> command, but "
 "this has some drawbacks."
 msgstr ""
+"缺省情况下,<command role=\"hg-cmd\">hg diff</command>命令的输出与普通的"
+"<command>diff</command>命令兼容,但是这样有缺点。"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch05-daily.xml:687
 "option>, to use a newer diff format that displays such information in a more "
 "readable form."
 msgstr ""
+"我们给一个文件改名,而<command role=\"hg-cmd\">hg diff</command>的输出却掩盖了"
+"事实。<command role=\"hg-cmd\">hg diff</command>命令可以接受选项<option>--"
+"git</option>或者<option>-g</option>,使用新的差异格式以更加可读的方式显示这些"
+"信息。"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch05-daily.xml:701
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.