# HG changeset patch
# User Pulkit Goyal <7895pulkit@gmail.com>
# Date 1584987209 -19800
# Node ID bdc8a5944d4433b5da9d038d31c3d336bc21b254
# Parent  78a8f65eacc8e4e0933ed77c8e3af1930c5cdc04
chgserver: add merge-tools to sensitive config items

Because this can change whether the ui is gui or not.

This fixes test-extdiff.t with chg.

diff -r 78a8f65eacc8 -r bdc8a5944d44 mercurial/chgserver.py
--- a/mercurial/chgserver.py	Wed Mar 25 13:20:08 2020 +0530
+++ b/mercurial/chgserver.py	Mon Mar 23 23:43:29 2020 +0530
@@ -80,10 +80,12 @@
 # sensitive config sections affecting confighash
 _configsections = [
     b'alias',  # affects global state commands.table
+    b'diff-tools',  # affects whether gui or not in extdiff's uisetup
     b'eol',  # uses setconfig('eol', ...)
     b'extdiff',  # uisetup will register new commands
     b'extensions',
     b'fastannotate',  # affects annotate command and adds fastannonate cmd
+    b'merge-tools',  # affects whether gui or not in extdiff's uisetup
     b'schemes',  # extsetup will update global hg.schemes
 ]