diff --git a/mercurial/help/config.txt b/mercurial/help/config.txt index 692bde7f486ddce18264c10fd4c7857b6acb5fb3_bWVyY3VyaWFsL2hlbHAvY29uZmlnLnR4dA==..0dae9147c3b6bd1a854734cdadc13910e6b9b85e_bWVyY3VyaWFsL2hlbHAvY29uZmlnLnR4dA== 100644 --- a/mercurial/help/config.txt +++ b/mercurial/help/config.txt @@ -982,7 +982,8 @@ launching external tool. Options are ``true``, ``false``, ``keep`` or ``keep-merge3``. The ``keep`` option will leave markers in the file if the premerge fails. The ``keep-merge3`` will do the same but include information - about the base of the merge in the marker (see internal:merge3). + about the base of the merge in the marker (see internal :merge3 in + :hg:`help merge-tools`). Default: True ``binary``