Commits

zhaopingsun  committed 486f791

5.4.4 zh translated

  • Participants
  • Parent commits 414a81a

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