--- a/tests/test-issue612.out	Thu Apr 10 14:25:50 2008 +0200
+++ b/tests/test-issue612.out	Thu Apr 10 15:02:24 2008 -0500
@@ -3,7 +3,7 @@
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 created new head
 ? src/a.o
-merging src/a.c and source/a.c
+merging src/a.c and source/a.c to source/a.c
 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 M source/a.c