author | timeless@mozdev.org |
Wed, 02 Sep 2015 02:04:45 -0400 | |
changeset 26179 | 5f2a1ebd6e78 |
parent 26178 | 457c60653c18 |
child 26180 | b1caa076fc3b |
--- a/mercurial/help/config.txt Wed Sep 02 02:04:22 2015 -0400 +++ b/mercurial/help/config.txt Wed Sep 02 02:04:45 2015 -0400 @@ -1038,7 +1038,7 @@ selected by file pattern match. ``check`` - A list of merge success-checking options: + A list of merge success-checking options:: ``changed`` Ask whether merge was successful when the merged file shows no changes.