# HG changeset patch
# User Augie Fackler <raf@durin42.com>
# Date 1393726123 18000
# Node ID 5beb49fd5958cd46cb933a8bccf482b56eb55b18
# Parent  bedb9f1a6b4e5a2ad1f4453ca106f69839d62884# Parent  2ae1b42d0559fcf6f142c123b634d34f829c111c
merge main and crew

diff -r bedb9f1a6b4e -r 5beb49fd5958 tests/test-help.t
--- a/tests/test-help.t	Sat Mar 01 21:08:28 2014 -0500
+++ b/tests/test-help.t	Sat Mar 01 21:08:43 2014 -0500
@@ -199,7 +199,7 @@
    urls          URL Paths
 
 Test extension help:
-  $ hg help extensions --config extensions.rebase= --config extensions.children=
+  $ hg help extensions --config extensions.rebase= --config extensions.children= | grep -v inotify
   Using Additional Features
   """""""""""""""""""""""""
   
@@ -259,7 +259,6 @@
        hgk           browse the repository in a graphical way
        highlight     syntax highlighting for hgweb (requires Pygments)
        histedit      interactive history editing
-       inotify       accelerate status report using Linux's inotify service
        interhg       expand expressions into changelog and summaries
        keyword       expand keywords in tracked files
        largefiles    track large binary files