changeset 26225 | e257df7a9974 |
parent 26182 | 6832ba528d1a |
child 26263 | bf2bfc6f45fb |
--- a/mercurial/help/config.txt Thu Sep 10 09:41:11 2015 -0400 +++ b/mercurial/help/config.txt Thu Sep 10 13:45:00 2015 -0400 @@ -1037,7 +1037,7 @@ This tool can merge symlinks. (default: False) ``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.