zhaopingsun avatar zhaopingsun committed 486f791

5.4.4 zh translated

Comments (0)

Files changed (1)

 #. type: Content of: <book><chapter><sect1><sect2><title>
 #: ../en/ch05-daily.xml:509
 msgid "Other name-related corner cases"
-msgstr "其它名称相关的情况"
+msgstr "其它名称相关的信息"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch05-daily.xml:511
 "same name.  This is documented as <ulink role=\"hg-bug\" url=\"http://www."
 "selenic.com/mercurial/bts/issue29\">issue 29</ulink>."
 msgstr ""
+"Mercurial很一直都有一个bug,如果它在进行合并的时候发现一边有一个文件,而另外"
+"一边有一个相同名称的目录,那么合并就会失败。这个问题记录在<ulink role=\"hg-bug"
+"\" url=\"http://www.selenic.com/mercurial/bts/issue29\">issue 29</ulink>。"
 
 #. type: Content of: <book><chapter><sect1><title>
 #: ../en/ch05-daily.xml:524
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.