equal
deleted
inserted
replaced
437 |
437 |
438 ``commands`` |
438 ``commands`` |
439 ------------ |
439 ------------ |
440 |
440 |
441 ``resolve.confirm`` |
441 ``resolve.confirm`` |
442 Confirm before re-merging all unresolved files when running |
442 Confirm before performing action if no filename is passed. |
443 :hg:`resolve --all`. |
|
444 (default: False) |
443 (default: False) |
445 |
444 |
446 ``resolve.mark-check`` |
445 ``resolve.mark-check`` |
447 Determines what level of checking :hg:`resolve --mark` will perform before |
446 Determines what level of checking :hg:`resolve --mark` will perform before |
448 marking files as resolved. Valid values are ``none`, ``warn``, and |
447 marking files as resolved. Valid values are ``none`, ``warn``, and |