Mercurial > hg-stable
changeset 9522:47f1d44d3fa3
notify: update test
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sat, 03 Oct 2009 14:39:46 -0500 |
parents | bc19a0b04e83 |
children | d932dc655881 |
files | tests/test-notify.out |
diffstat | 1 files changed, 1 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- 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]