From patchwork Mon Oct 2 18:17:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: D906: registrar: fixing typo in comment From: phabricator X-Patchwork-Id: 24409 Message-Id: <428ec03e82f939b8ee1a60e39a6197c1@localhost.localdomain> To: mercurial-devel@mercurial-scm.org Date: Mon, 2 Oct 2017 18:17:53 +0000 This revision was automatically updated to reflect the committed changes. Closed by commit rHGc1fe66e89f57: registrar: fixing typo in comment (authored by singhsrb, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D906?vs=2344&id=2345 REVISION DETAIL https://phab.mercurial-scm.org/D906 AFFECTED FILES mercurial/registrar.py CHANGE DETAILS To: singhsrb, #hg-reviewers, indygreg Cc: mercurial-devel diff --git a/mercurial/registrar.py b/mercurial/registrar.py --- a/mercurial/registrar.py +++ b/mercurial/registrar.py @@ -347,7 +347,7 @@ fullmerge o o o ========== ======== ======== ========= - Optional argument 'onfalure' is the format of warning message + Optional argument 'onfailure' is the format of warning message to be used at failure of merging (target filename is specified at formatting). Or, None or so, if warning message should be suppressed.