zhaopingsun avatar zhaopingsun committed 199c1c7

3.1.2 one para zh translated

Comments (0)

Files changed (1)

 "revert any uncommitted changes in the working directory.)"
 msgstr ""
 "Mercurial告诉我们<command role=\"hg-cmd\">hg update</command>不能进行合并;当"
-"它认为我们可能需要进行合并的时候,它不会更工作目录。除非我们强制它这样做。(附带"
-"说一下,使用<command>hg update -C</command>命令强制更新会丢掉当前目录没有提交"
-"的变更。)"
+"它认为我们可能需要进行合并的时候,它不会更工作目录。除非我们强制它这样做。(附"
+"带说一下,使用<command>hg update -C</command>命令强制更新会丢掉当前目录没有提"
+"交的变更。)"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch03-tour-merge.xml:134
 "of our former heads as its parents.  These are the same revisions that were "
 "previously displayed by <command role=\"hg-cmd\">hg parents</command>."
 msgstr ""
+"现在我们有了一个新的顶点版本;注意先前的领头版本<emphasis>都</emphasis>是它的"
+"父版本。这和刚才我们用 <command role=\"hg-cmd\">hg parents</command>显示的版本"
+"一致。"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch03-tour-merge.xml:167
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.