diff --git a/i18n/da.po b/i18n/da.po --- a/i18n/da.po +++ b/i18n/da.po @@ -10034,7 +10034,7 @@ " If no revision is specified, the working directory's parent is a\n" " head revision, and the current branch contains exactly one other\n" " head, the other head is merged with by default. Otherwise, an\n" -" explicit revision with which to merge with must be provided." +" explicit revision with which to merge must be provided." msgstr "" " Hvis ingen revision angives og arbejdskatalogets forælder er en\n" " hovedrevision og den nuværende gren indeholder præcis et andet\n" diff --git a/i18n/de.po b/i18n/de.po --- a/i18n/de.po +++ b/i18n/de.po @@ -13020,7 +13020,7 @@ " If no revision is specified, the working directory's parent is a\n" " head revision, and the current branch contains exactly one other\n" " head, the other head is merged with by default. Otherwise, an\n" -" explicit revision with which to merge with must be provided." +" explicit revision with which to merge must be provided." msgstr "" " Wenn keine Revision angegeben wird und der Vorgänger des Arbeits-\n" " verzeichnisses eine Kopfversion eines Zweiges mit genau zwei Köpfen " diff --git a/i18n/el.po b/i18n/el.po --- a/i18n/el.po +++ b/i18n/el.po @@ -6881,7 +6881,7 @@ " If no revision is specified, the working directory's parent is a\n" " head revision, and the current branch contains exactly one other\n" " head, the other head is merged with by default. Otherwise, an\n" -" explicit revision with which to merge with must be provided.\n" +" explicit revision with which to merge must be provided.\n" " " msgstr "" diff --git a/i18n/fr.po b/i18n/fr.po --- a/i18n/fr.po +++ b/i18n/fr.po @@ -8713,7 +8713,7 @@ " If no revision is specified, the working directory's parent is a\n" " head revision, and the current branch contains exactly one other\n" " head, the other head is merged with by default. Otherwise, an\n" -" explicit revision with which to merge with must be provided.\n" +" explicit revision with which to merge must be provided.\n" " " msgstr "" diff --git a/i18n/it.po b/i18n/it.po --- a/i18n/it.po +++ b/i18n/it.po @@ -7843,7 +7843,7 @@ " If no revision is specified, the working directory's parent is a\n" " head revision, and the current branch contains exactly one other\n" " head, the other head is merged with by default. Otherwise, an\n" -" explicit revision with which to merge with must be provided." +" explicit revision with which to merge must be provided." msgstr "" msgid " :hg:`resolve` must be used to resolve unresolved files." diff --git a/i18n/ja.po b/i18n/ja.po --- a/i18n/ja.po +++ b/i18n/ja.po @@ -16980,7 +16980,7 @@ " If no revision is specified, the working directory's parent is a\n" " head revision, and the current branch contains exactly one other\n" " head, the other head is merged with by default. Otherwise, an\n" -" explicit revision with which to merge with must be provided." +" explicit revision with which to merge must be provided." msgstr "" " マージ対象リビジョンの指定が無く、 作業領域の親リビジョンがヘッドで、\n" " 且つ現行ブランチがもう1つだけヘッドを持つ場合、 そのヘッドがマージ\n" diff --git a/i18n/pt_BR.po b/i18n/pt_BR.po --- a/i18n/pt_BR.po +++ b/i18n/pt_BR.po @@ -17397,7 +17397,7 @@ " If no revision is specified, the working directory's parent is a\n" " head revision, and the current branch contains exactly one other\n" " head, the other head is merged with by default. Otherwise, an\n" -" explicit revision with which to merge with must be provided." +" explicit revision with which to merge must be provided." msgstr "" " Se a revisão não for especificada, o pai do diretório de trabalho\n" " for uma revisão cabeça, e o ramo atual contiver exatamente uma\n" diff --git a/i18n/ro.po b/i18n/ro.po --- a/i18n/ro.po +++ b/i18n/ro.po @@ -8715,7 +8715,7 @@ " If no revision is specified, the working directory's parent is a\n" " head revision, and the current branch contains exactly one other\n" " head, the other head is merged with by default. Otherwise, an\n" -" explicit revision with which to merge with must be provided." +" explicit revision with which to merge must be provided." msgstr "" " Dacă nu se specifică niciun părinte, părintele directorului de\n" " lucru este o revizie capăt, iar ramura curentă conține exact\n" diff --git a/i18n/ru.po b/i18n/ru.po --- a/i18n/ru.po +++ b/i18n/ru.po @@ -14008,7 +14008,7 @@ " If no revision is specified, the working directory's parent is a\n" " head revision, and the current branch contains exactly one other\n" " head, the other head is merged with by default. Otherwise, an\n" -" explicit revision with which to merge with must be provided." +" explicit revision with which to merge must be provided." msgstr "" " Если ревизия не указана, родитель рабочего каталога является\n" " головной ревизией и текущая ветка имеет ровно одну другую голову,\n" diff --git a/i18n/sv.po b/i18n/sv.po --- a/i18n/sv.po +++ b/i18n/sv.po @@ -10897,7 +10897,7 @@ " If no revision is specified, the working directory's parent is a\n" " head revision, and the current branch contains exactly one other\n" " head, the other head is merged with by default. Otherwise, an\n" -" explicit revision with which to merge with must be provided." +" explicit revision with which to merge must be provided." msgstr "" " Om ingen revision anges, arbetskatalogens förälder är en huvudrevision,\n" " och den nuvarande grenen innehåller exakt ett annat huvud, sammanfogas\n" diff --git a/i18n/zh_CN.po b/i18n/zh_CN.po --- a/i18n/zh_CN.po +++ b/i18n/zh_CN.po @@ -6520,7 +6520,7 @@ " If no revision is specified, the working directory's parent is a\n" " head revision, and the current branch contains exactly one other\n" " head, the other head is merged with by default. Otherwise, an\n" -" explicit revision with which to merge with must be provided.\n" +" explicit revision with which to merge must be provided.\n" " " msgstr "" "将工作目录与其它版本合并\n" diff --git a/i18n/zh_TW.po b/i18n/zh_TW.po --- a/i18n/zh_TW.po +++ b/i18n/zh_TW.po @@ -7341,7 +7341,7 @@ " If no revision is specified, the working directory's parent is a\n" " head revision, and the current branch contains exactly one other\n" " head, the other head is merged with by default. Otherwise, an\n" -" explicit revision with which to merge with must be provided." +" explicit revision with which to merge must be provided." msgstr "" msgid " :hg:`resolve` must be used to resolve unresolved files." diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -3991,7 +3991,7 @@ If no revision is specified, the working directory's parent is a head revision, and the current branch contains exactly one other head, the other head is merged with by default. Otherwise, an - explicit revision with which to merge with must be provided. + explicit revision with which to merge must be provided. See :hg:`help resolve` for information on handling file conflicts.