# HG changeset patch # User timeless@mozdev.org # Date 2015-09-02 06:04:45 # Node ID 5f2a1ebd6e78887314e24b3eaa2e931ac5549dae # Parent 457c60653c18b4d00817bd46b501f4d3e5cb3c65 help/config: include check values diff --git a/mercurial/help/config.txt b/mercurial/help/config.txt --- a/mercurial/help/config.txt +++ b/mercurial/help/config.txt @@ -1038,7 +1038,7 @@ Supported arguments: 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.