tests/test-merge8.out
changeset 11981 518b90d66fad
parent 11980 c443e95d295b
child 11982 56d9b73487ff
--- a/tests/test-merge8.out	Wed Aug 18 05:54:00 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-updating to branch default
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-pulling from ../a
-searching for changes
-adding changesets
-adding manifests
-adding file changes
-added 2 changesets with 2 changes to 1 files
-(run 'hg update' to get a working copy)
-1 files updated, 0 files merged, 1 files removed, 0 files unresolved