Submitter | phabricator |
---|---|
Date | Oct. 2, 2017, 6:17 p.m. |
Message ID | <428ec03e82f939b8ee1a60e39a6197c1@localhost.localdomain> |
Download | mbox | patch |
Permalink | /patch/24409/ |
State | Not Applicable |
Headers | show |
Comments
Patch
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.