# HG changeset patch
# User Augie Fackler <augie@google.com>
# Date 1611076925 18000
# Node ID 3b1c0c36760657720ba782e365c18fd0f69712fc
# Parent  4b0192f592cf1962576ef6b6bc688bd11ac2cbd6# Parent  7e44d5ca2a2f976fb68413b872c6fa4f51cf429e
merge with stable

diff -r 7e44d5ca2a2f -r 3b1c0c367606 mercurial/helptext/config.txt