# HG changeset patch
# User Boris Feld <boris.feld@octobus.net>
# Date 1498787006 -7200
# Node ID 8bf8ed0deab86c70ff774910476dab88770e9c33
# Parent  b76dc3e6bf99dd492b0451279c8a2c26b99c5f7a
configitems: register the 'notify.merge' config

diff -r b76dc3e6bf99 -r 8bf8ed0deab8 hgext/notify.py
--- a/hgext/notify.py	Fri Jun 30 03:43:25 2017 +0200
+++ b/hgext/notify.py	Fri Jun 30 03:43:26 2017 +0200
@@ -179,6 +179,9 @@
 configitem('notify', 'mbox',
     default=None,
 )
+configitem('notify', 'merge',
+    default=True,
+)
 
 # template for single changeset can include email headers.
 single_template = '''
@@ -220,7 +223,7 @@
         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