Show More
@@ -347,7 +347,7 b' class internalmerge(_funcregistrarbase):' | |||||
347 | fullmerge o o o |
|
347 | fullmerge o o o | |
348 | ========== ======== ======== ========= |
|
348 | ========== ======== ======== ========= | |
349 |
|
349 | |||
350 | Optional argument 'onfalure' is the format of warning message |
|
350 | Optional argument 'onfailure' is the format of warning message | |
351 | to be used at failure of merging (target filename is specified |
|
351 | to be used at failure of merging (target filename is specified | |
352 | at formatting). Or, None or so, if warning message should be |
|
352 | at formatting). Or, None or so, if warning message should be | |
353 | suppressed. |
|
353 | suppressed. |
General Comments 0
You need to be logged in to leave comments.
Login now