--- a/tests/test-merge-local.out Mon Jun 08 18:14:44 2009 -0500
+++ b/tests/test-merge-local.out Mon Jun 08 18:14:44 2009 -0500
@@ -22,7 +22,9 @@
merging zzz2_merge_bad failed!
3 files updated, 1 files merged, 2 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges
-2 files updated, 0 files merged, 3 files removed, 0 files unresolved
+merging zzz1_merge_ok
+merging zzz2_merge_bad
+2 files updated, 2 files merged, 3 files removed, 0 files unresolved
--- a/zzz1_merge_ok
+++ b/zzz1_merge_ok
+new first line
@@ -32,7 +34,6 @@
+another last line
M zzz1_merge_ok
M zzz2_merge_bad
-? zzz2_merge_bad.orig
# local merge with conflicts
merging zzz1_merge_ok
merging zzz2_merge_bad
@@ -40,7 +41,9 @@
merging zzz2_merge_bad failed!
3 files updated, 1 files merged, 2 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges
-2 files updated, 0 files merged, 3 files removed, 0 files unresolved
+merging zzz1_merge_ok
+merging zzz2_merge_bad
+2 files updated, 2 files merged, 3 files removed, 0 files unresolved
--- a/zzz1_merge_ok
+++ b/zzz1_merge_ok
+new first line
@@ -52,7 +55,6 @@
+new last line
M zzz1_merge_ok
M zzz2_merge_bad
-? zzz2_merge_bad.orig
# local merge without conflicts
merging zzz1_merge_ok
4 files updated, 1 files merged, 2 files removed, 0 files unresolved