Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgext/notify.py
changeset 33745 8bf8ed0deab8
parent 33744 b76dc3e6bf99
child 33746 20189ba5fddf 
--- 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
mercurial