zhaopingsun avatar zhaopingsun committed c3dc720

3.2.2 zh translated

Comments (0)

Files changed (1)

 "we were running a graphical merge tool and quit because we were confused or "
 "realised we had made a mistake."
 msgstr ""
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch03-tour-merge.xml:350
 "<quote>fixing up</quote> the affected files ourselves, and committing the "
 "results of our merge:"
 msgstr ""
 #. type: Content of: <book><chapter><sect1><sect2><note><title>
 #: ../en/ch03-tour-merge.xml:357
 "strongly consider upgrading to a newer version before trying to tackle "
 "complicated merges."
 msgstr ""
+"Mercurial 1.1版于2008年发布,从这个版本开始引入了<command>hg resolve</command>"
+"命令。如果你还在使用更老的版本(可以运行<command>hg version</command>命令查"
 #. type: Content of: <book><chapter><sect1><title>
 #: ../en/ch03-tour-merge.xml:371
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.