--- a/tests/test-inotify	Mon Apr 19 20:30:31 2010 +0200
+++ b/tests/test-inotify	Mon Apr 19 20:41:53 2010 +0200
@@ -82,7 +82,7 @@
 echo c >> a
 hg st
 
-hg up 0
+HGMERGE=internal:local hg up 0
 hg st
 
 HGMERGE=internal:local hg up