changeset 34437 | c1fe66e89f57 |
parent 34382 | 4735c1caf6b3 |
child 34781 | fe987d0b9e1e |
--- a/mercurial/registrar.py Fri Sep 29 15:49:20 2017 +0000 +++ b/mercurial/registrar.py Mon Oct 02 19:17:04 2017 +0100 @@ -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.