zhaopingsun avatar zhaopingsun committed 2bec83b

fix

Comments (0)

Files changed (1)

 "filename> into its copy, <filename>new-file</filename>."
 msgstr ""
 "现在版本库里面有了修改过的文件。我们从第一个版本库拖变更,并且合并两个顶版本,"
-"Mercurial会将变更从我们修改的文件<filename>file</filename>传递给它的拷贝,"
+"Mercurial会将变更从我们修改的文件<filename>file</filename>传递给它的拷贝,"
 "<filename>new-file</filename>。"
 
 #. type: Content of: <book><chapter><sect1><sect2><title>
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.