--- a/tests/test-up-local-change.out Sun Mar 12 20:34:09 2006 +0100
+++ b/tests/test-up-local-change.out Mon Mar 13 08:56:59 2006 +0100
@@ -21,6 +21,7 @@
merging a
resolving a
file a: my b789fdd96dc2 other d730145abbf9 ancestor b789fdd96dc2
+1 files updated, 1 files merged, 0 files removed, 0 files unresolved
changeset: 1:1e71731e6fbb
tag: tip
user: test
@@ -32,6 +33,7 @@
ancestor a0c8bcbbb45c local 1165e8bd193e remote a0c8bcbbb45c
remote deleted b
removing b
+0 files updated, 0 files merged, 1 files removed, 0 files unresolved
changeset: 0:c19d34741b0a
user: test
date: Thu Jan 1 00:00:00 1970 +0000
@@ -53,6 +55,7 @@
merging a
resolving a
file a: my b789fdd96dc2 other d730145abbf9 ancestor b789fdd96dc2
+1 files updated, 1 files merged, 0 files removed, 0 files unresolved
changeset: 1:1e71731e6fbb
tag: tip
user: test
@@ -113,6 +116,8 @@
merging b
resolving b
file b: my 1e88685f5dde other 61de8c7723ca ancestor 000000000000
+0 files updated, 2 files merged, 0 files removed, 0 files unresolved
+(branch merge, don't forget to commit)
changeset: 1:1e71731e6fbb
user: test
date: Thu Jan 1 00:00:00 1970 +0000