diff -r 469850088fc1 -r 3cb0559e44d0 tests/test-merge4.out
--- a/tests/test-merge4.out	Wed Oct 20 23:39:48 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-created new head
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)