diff setup.py @ 16002:384f7521c791 stable

i18n-ru: fix typos in `resolve` help * help entry is called 'merge-tools', not 'merge-tool'; * envvar is called HGMERGE, not HGEMERGT.
author Nikolaj Sjujskij <sterkrig@myopera.com>
date Thu, 26 Jan 2012 16:56:11 +0400
parents 9926aab3d0b5
children 82ce91a9fd94
line wrap: on
line diff