diff --git a/tests/test-merge4.out b/tests/test-merge4.out
--- a/tests/test-merge4.out
+++ b/tests/test-merge4.out
@@ -0,0 +1,3 @@
+0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+(branch merge, don't forget to commit)