zhaopingsun avatar zhaopingsun committed 70aab97

5.6 first para zh translated

Comments (0)

Files changed (1)

 "for adding by Mercurial any longer, either.  You can also use <command role="
 "\"hg-cmd\">hg revert</command> to get rid of erroneous changes to a file."
 msgstr ""
-"<command role=\"hg-cmd\">hg revert</command>命令让你取消对工作目录做的变更。比"
+"可以<command role=\"hg-cmd\">hg revert</command>命令取消对工作目录做的变更。比"
 "如,你不小心用<command role=\"hg-cmd\">hg add</command>命令添加了一个文件,只"
-"要运行<command role=\"hg-cmd\">hg revert</command>加上你添加的文件的文件名,但"
-"是文件的内容不会有任何改变,仅仅是Mercurial不再跟踪它了。你也可以用<command "
-"role=\"hg-cmd\">hg revert</command>消除对文件作出的错误的更改。"
+"要运行<command role=\"hg-cmd\">hg revert</command>加上你添加的文件的文件名就可"
+"以了,文件的内容不会有任何改变,仅仅是Mercurial不再跟踪它了。你也可以用"
+"<command role=\"hg-cmd\">hg revert</command>消除对文件作出的错误的更改。"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch05-daily.xml:539
 "inevitably going to result in conflicts, some of which can take a few tries "
 "to sort out."
 msgstr ""
+"在庞大而且复杂的项目中,两个变更集的合并常常让人头痛。假设有关大的源文件,合并"
+"的两边都作了很多修改:这不可避免的会导致很多冲突,有些要试几次才能解决。"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch05-daily.xml:562
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.