diff -r 4ce9e536dd66 -r 4751d77394b1 devtools/cwwindmill.py
--- a/devtools/cwwindmill.py	Thu Mar 10 15:18:22 2011 +0100
+++ b/devtools/cwwindmill.py	Fri Mar 11 09:47:09 2011 +0100
@@ -86,9 +86,11 @@
 
             test_dir = __file__
 
-        Instead of toggle `edit_test` value, try `pytest -i`
+        Instead of toggle `edit_test` value, try `python <test script> -f`
         """
         browser = 'firefox'
+<<<<<<< /home/syt/src/fcubicweb/cubicweb/devtools/cwwindmill.py
+
         edit_test = "-i" in sys.argv # detection for pytest invocation
         # Windmill use case are written with no anonymous user
         anonymous_allowed = False