--- a/mercurial/filemerge.py Sun Mar 12 21:50:42 2017 -0700
+++ b/mercurial/filemerge.py Mon Dec 26 16:54:33 2016 -0700
@@ -35,8 +35,8 @@
def _toolbool(ui, tool, part, default=False):
return ui.configbool("merge-tools", tool + "." + part, default)
-def _toollist(ui, tool, part, default=[]):
- return ui.configlist("merge-tools", tool + "." + part, default)
+def _toollist(ui, tool, part, default=None):
+ return ui.configlist("merge-tools", tool + "." + part, default or [])
internals = {}
# Merge tools to document.