tests/test-merge5.out
changeset 2175 b2ae81a7df29
parent 2038 5c4496ed152d
child 2830 49988d9f0758
--- a/tests/test-merge5.out
+++ b/tests/test-merge5.out
@@ -1,3 +1,4 @@
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 removing b
 this update spans a branch affecting the following files:
  b