zhaopingsun avatar zhaopingsun committed a9c5c2b

3.2.0 zh translated

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
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.