diff -r 79d681753c4d -r ed84a4d48910 mercurial/ui.py
--- a/mercurial/ui.py	Mon Oct 26 10:08:22 2020 -0700
+++ b/mercurial/ui.py	Fri Oct 23 10:56:18 2020 -0700
@@ -507,6 +507,8 @@
                 del cfg[b'defaults'][k]
             for k, v in cfg.items(b'commands'):
                 del cfg[b'commands'][k]
+            for k, v in cfg.items(b'command-templates'):
+                del cfg[b'command-templates'][k]
         # Don't remove aliases from the configuration if in the exceptionlist
         if self.plain(b'alias'):
             for k, v in cfg.items(b'alias'):