Commits

zhaopingsun committed 3878d28

3.2 last para

  • Participants
  • Parent commits 3525c20

Comments (0)

Files changed (1)

 "setting the <envar>HGMERGE</envar> environment variable to the name of your "
 "preferred program."
 msgstr ""
+"如果将环境变量<envar>HGMERGE</envar>传给你的程序,还可以让Mercurial运行特定的"
+"程序或者脚本。"
 
 #. type: Content of: <book><chapter><sect1><sect2><title>
 #: ../en/ch03-tour-merge.xml:236