--- a/tests/test-help.t Fri Dec 03 12:03:23 2021 +0100
+++ b/tests/test-help.t Fri Dec 03 14:36:40 2021 +0100
@@ -1517,26 +1517,38 @@
"commands.update.check"
Determines what level of checking 'hg update' will perform before
moving to a destination revision. Valid values are "abort", "none",
- "linear", and "noconflict". "abort" always fails if the working
- directory has uncommitted changes. "none" performs no checking, and
- may result in a merge with uncommitted changes. "linear" allows any
- update as long as it follows a straight line in the revision history,
- and may trigger a merge with uncommitted changes. "noconflict" will
- allow any update which would not trigger a merge with uncommitted
- changes, if any are present. (default: "linear")
+ "linear", and "noconflict".
+
+ - "abort" always fails if the working directory has uncommitted
+ changes.
+ - "none" performs no checking, and may result in a merge with
+ uncommitted changes.
+ - "linear" allows any update as long as it follows a straight line in
+ the revision history, and may trigger a merge with uncommitted
+ changes.
+ - "noconflict" will allow any update which would not trigger a merge
+ with uncommitted changes, if any are present.
+
+ (default: "linear")
$ hg help config.commands.update.check
"commands.update.check"
Determines what level of checking 'hg update' will perform before
moving to a destination revision. Valid values are "abort", "none",
- "linear", and "noconflict". "abort" always fails if the working
- directory has uncommitted changes. "none" performs no checking, and
- may result in a merge with uncommitted changes. "linear" allows any
- update as long as it follows a straight line in the revision history,
- and may trigger a merge with uncommitted changes. "noconflict" will
- allow any update which would not trigger a merge with uncommitted
- changes, if any are present. (default: "linear")
+ "linear", and "noconflict".
+
+ - "abort" always fails if the working directory has uncommitted
+ changes.
+ - "none" performs no checking, and may result in a merge with
+ uncommitted changes.
+ - "linear" allows any update as long as it follows a straight line in
+ the revision history, and may trigger a merge with uncommitted
+ changes.
+ - "noconflict" will allow any update which would not trigger a merge
+ with uncommitted changes, if any are present.
+
+ (default: "linear")
$ hg help config.ommands.update.check