Mercurial > hg
comparison tests/tinyproxy.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 | 0b21ae0a2366 |
children | 74e114ac6ec1 |
comparison
equal
deleted
inserted
replaced
15997:a45516cb8d9f | 16002:384f7521c791 |
---|