Commits

zhaopingsun committed 8caa9be

type error

Comments (0)

Files changed (1)

 "inevitably going to result in conflicts, some of which can take a few tries "
 "to sort out."
 msgstr ""
-"在庞大而且复杂的项目中,两个变更集的合并常常让人头痛。假设有大的源文件,合并"
+"在庞大而且复杂的项目中,两个变更集的合并常常让人头痛。假设有个很大的源文件,合并"
 "的两边都作了很多修改:这不可避免的会导致很多冲突,有些要试几次才能解决。"
 
 #. type: Content of: <book><chapter><sect1><para>