zhaopingsun avatar zhaopingsun committed 238106d

3.1.2 first 2 paras zh translated

Comments (0)

Files changed (1)

 "What happens if we try to use the normal <command role=\"hg-cmd\">hg update</"
 "command> command to update to the new tip?"
 msgstr ""
+"如果我们使用常用的<command role=\"hg-cmd\">hg update</command>命令来更新到新的"
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch03-tour-merge.xml:126
 "(Incidentally, forcing the update with <command>hg update -C</command> would "
 "revert any uncommitted changes in the working directory.)"
 msgstr ""
+"Mercurial告诉我们<command role=\"hg-cmd\">hg update</command>不能进行合并;当"
+"说一下,使用<command>hg update -C</command>命令强制更新会丢掉当前目录没有提交"
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch03-tour-merge.xml:134
 "To start a merge between the two heads, we use the <command role=\"hg-cmd"
 "\">hg merge</command> command."
 msgstr ""
-"我们使用 <command role=\"hg-cmd\">hg merge</command> 命令来合并两个顶点。"
+"我们使用 <command role=\"hg-cmd\">hg merge</command> 命令来合并两个领头版本。"
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch03-tour-merge.xml:139
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.