# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 2009-10-03 19:39:46
# Node ID 47f1d44d3fa353e8b7ef8cf2126b061d504a333b
# Parent  bc19a0b04e83ee6d5258451694bf0c03778730de

notify: update test

diff --git a/tests/test-notify.out b/tests/test-notify.out
--- a/tests/test-notify.out
+++ b/tests/test-notify.out
@@ -35,6 +35,7 @@ Optional configuration items:
   diffstat = True        # add a diffstat before the diff content
   sources = serve        # notify if source of incoming changes in this list
                          # (serve == ssh or http, push, pull, bundle)
+  merge = False          # send notification for merges (default True)
   [email]
   from = user@host.com   # email address to send as if none given
   [web]