tests/test-merge6.out
changeset 793 445970ccf57a
parent 749 7e4843b7efd2
parent 775 122449dd89db
child 801 1f9ec150a476
--- a/tests/test-merge6.out	Sat Jul 23 17:14:05 2005 +0100
+++ b/tests/test-merge6.out	Fri Jul 29 06:43:21 2005 +0100
@@ -27,8 +27,8 @@
 searching for changes
 adding changesets
 adding manifests
-adding file revisions
-modified 1 files, added 1 changesets and 1 new revisions
+adding file changes
+added 1 changesets with 1 changes to 1 files
 (run 'hg update' to get a working copy)
 + hg update -m
 + hg commit -m 'commit test' -d '0 0'
@@ -42,8 +42,8 @@
 searching for changes
 adding changesets
 adding manifests
-adding file revisions
-modified 0 files, added 1 changesets and 0 new revisions
+adding file changes
+added 1 changesets with 0 changes to 0 files
 (run 'hg update' to get a working copy)
 + hg update -m
 + hg commit -m 'commit test' -d '0 0'