merge: introduce tool.check parameter
tool.check is a list of check options, and can be used in place of
tool.checkchanged and tool.checkconflicts:
Equivalences:
tool.checkchanged = yes
tool.checkconflicts = no
tool.check = changed
tool.checkchanged = no
tool.checkconflicts = yes
tool.check = conflicts
tool.checkchanged = yes
tool.checkconflicts = yes
tool.check = changed, conflicts
Add _toollist() wrapper for ui.configlist() to implement this consistently.
checkchanged and checkconflicts are still supported, but check is
preferred for implementing new check options.
adding a
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
@ 3:AD 1d4e82ed3c2a
|
| o 2:C 7e1afe9214b2
| |
| o 1:B 0a6620c3c26a
|/
o 0:A 1e635d440a73
@ 3:C 0c5887756284
|
o 2:B 4f208f4a1507
|
o 1:AD 1d4e82ed3c2a
|
o 0:A 1e635d440a73