# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1348012763 -3600
# Node ID 183d7e3d7ce8b6fe52783fbd5c87a5631c924218
# Parent  13a3f6161af826af1dba3f7cab296fdf01c62eb5# Parent  82f74372516eb235a78c9c7cd361879c938567dd
Merge with stable

diff -r 13a3f6161af8 -r 183d7e3d7ce8 tests/hghave.py
--- a/tests/hghave.py	Thu Sep 13 23:02:29 2012 +0100
+++ b/tests/hghave.py	Wed Sep 19 00:59:23 2012 +0100
@@ -118,6 +118,9 @@
     except OSError:
         return False
 
+def has_killdaemons():
+    return True
+
 def has_cacheable_fs():
     from mercurial import util
 
@@ -286,6 +289,7 @@
     "hardlink": (has_hardlink, "hardlinks"),
     "icasefs": (has_icasefs, "case insensitive file system"),
     "inotify": (has_inotify, "inotify extension support"),
+    "killdaemons": (has_killdaemons, 'killdaemons.py support'),
     "lsprof": (has_lsprof, "python lsprof module"),
     "mtn": (has_mtn, "monotone client (>= 1.0)"),
     "outer-repo": (has_outer_repo, "outer repo"),