equal
deleted
inserted
replaced
12008 " ``--tool`` can be used to specify the merge tool used for file\n" |
12008 " ``--tool`` can be used to specify the merge tool used for file\n" |
12009 " merges. It overrides the HGMERGE environment variable and your\n" |
12009 " merges. It overrides the HGMERGE environment variable and your\n" |
12010 " configuration files. See :hg:`help merge-tools` for options." |
12010 " configuration files. See :hg:`help merge-tools` for options." |
12011 msgstr "" |
12011 msgstr "" |
12012 " С помощью ``--tool`` можно задать инструмент для слияния файлов.\n" |
12012 " С помощью ``--tool`` можно задать инструмент для слияния файлов.\n" |
12013 " Она заменяет переменную окружения HGEMERGT и настройки конфига.\n" |
12013 " Она заменяет переменную окружения HGMERGE и настройки конфига.\n" |
12014 " Подробнее см. :hg:``help merge-tool``." |
12014 " Подробнее см. :hg:``help merge-tools``." |
12015 |
12015 |
12016 msgid "" |
12016 msgid "" |
12017 " If no revision is specified, the working directory's parent is a\n" |
12017 " If no revision is specified, the working directory's parent is a\n" |
12018 " head revision, and the current branch contains exactly one other\n" |
12018 " head revision, and the current branch contains exactly one other\n" |
12019 " head, the other head is merged with by default. Otherwise, an\n" |
12019 " head, the other head is merged with by default. Otherwise, an\n" |