--- a/tests/test-inotify.out	Mon Jul 13 16:49:05 2009 +0200
+++ b/tests/test-inotify.out	Mon Jul 13 21:55:17 2009 +0900
@@ -38,3 +38,9 @@
 removing h/h
 A h
 R h/h
+M a
+merging a
+1 files updated, 1 files merged, 2 files removed, 0 files unresolved
+M a
+3 files updated, 1 files merged, 0 files removed, 0 files unresolved
+M a