zhaopingsun avatar zhaopingsun committed 717eaac


Comments (0)

Files changed (1)

 "If we now fire up <command role=\"hg-cmd\">hg merge</command>, it should "
 "grind to a halt and report a failure."
 msgstr ""
+"如果现在我们运行<command role=\"hg-cmd\">hg merge</command>,他会停止运行同时"
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch05-daily.xml:605
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.