diff -r 7e30f5f2285f -r 0776a6cababe tests/test-issue612.t
--- a/tests/test-issue612.t	Thu Feb 09 16:50:19 2012 -0600
+++ b/tests/test-issue612.t	Thu Feb 09 17:04:17 2012 -0600
@@ -24,11 +24,11 @@
 
   $ hg merge
   merging src/a.c and source/a.c to source/a.c
-  1 files updated, 1 files merged, 0 files removed, 0 files unresolved
+  0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
   $ hg status
   M source/a.c
   R src/a.c
-  ? source/a.o
+  ? src/a.o