author | Matt Mackall <mpm@selenic.com> |
Sat, 03 Oct 2009 14:39:46 -0500 | |
changeset 9522 | 47f1d44d3fa3 |
parent 9518 | bc19a0b04e83 |
child 9523 | d932dc655881 |
--- a/tests/test-notify.out Thu Oct 01 15:36:45 2009 -0400 +++ b/tests/test-notify.out Sat Oct 03 14:39:46 2009 -0500 @@ -35,6 +35,7 @@ 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]