--- 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.