Commits

zhaopingsun committed 717eaac

5.6.0

  • Participants
  • Parent commits 4a7d5a6

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