Commits

zhaopingsun  committed a9c5c2b

3.2.0 zh translated

  • Participants
  • Parent commits e503c30

Comments (0)

Files changed (1)

 "succeed (because the resolution process requires human guidance) or aren't "
 "present, it tries a few different graphical merging tools."
 msgstr ""
+"Mercurial没有内建的工具处理冲突。相反,它会运行外部程序,通常是一个能够以图形"
+"化显示冲突的软件。缺省情况下,Mercurial会试着从有可能在你系统上安装的几个合并"
+"工具中挑选一个。它首先会尝试几个全自动的合并工具;如果不成功(因为解决冲突需要"
+"人工干预)或者找不到,它会尝试其他不同的图形化合并工具。"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch03-tour-merge.xml:230