# HG changeset patch
# User Boris Feld <boris.feld@octobus.net>
# Date 2017-06-30 01:43:26
# Node ID 8bf8ed0deab86c70ff774910476dab88770e9c33
# Parent  b76dc3e6bf99dd492b0451279c8a2c26b99c5f7a

configitems: register the 'notify.merge' config

diff --git a/hgext/notify.py b/hgext/notify.py
--- a/hgext/notify.py
+++ b/hgext/notify.py
@@ -179,6 +179,9 @@ configitem('notify', 'maxsubject',
 configitem('notify', 'mbox',
     default=None,
 )
+configitem('notify', 'merge',
+    default=True,
+)
 
 # template for single changeset can include email headers.
 single_template = '''
@@ -220,7 +223,7 @@ class notifier(object):
         self.test = self.ui.configbool('notify', 'test', True)
         self.charsets = mail._charsets(self.ui)
         self.subs = self.subscribers()
-        self.merge = self.ui.configbool('notify', 'merge', True)
+        self.merge = self.ui.configbool('notify', 'merge')
 
         mapfile = None
         template = (self.ui.config('notify', hooktype) or