tests/test-inotify

--- a/tests/test-inotify	Mon Jul 13 16:49:05 2009 +0200
+++ b/tests/test-inotify	Mon Jul 13 21:55:17 2009 +0900
@@ -50,4 +50,24 @@
 hg status
 hg ci -m0
 
+# Test for issue1735: inotify watches files in .hg/merge
+hg st
+
+echo a > a
+
+hg ci -Am a
+hg st
+
+echo b >> a
+hg ci -m ab
+hg st
+
+echo c >> a
+hg st
+
+hg up 0
+hg st
+
+HGMERGE=internal:local hg up
+hg st
 kill `cat hg.pid`