--- a/tests/test-merge2.out
+++ b/tests/test-merge2.out
@@ -1,2 +1,5 @@
+0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+0 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b
+0 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b