diff mercurial/merge.py @ 16878:74abb39adef8 stable

i18n-ru: synchronized with 4cf41c333e74
author Alexander Sauta <demosito@gmail.com>
date Tue, 05 Jun 2012 07:57:04 +0100
parents ebf6d38c9063
children 525fdb738975
line wrap: on
line diff