--- a/tests/test-merge7.t Thu Sep 16 16:12:26 2010 -0500
+++ b/tests/test-merge7.t Thu Sep 16 17:51:32 2010 -0500
@@ -48,6 +48,7 @@
merging test.txt failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
+ [1]
resolve conflict
$ cat >test.txt <<"EOF"
> one
@@ -92,6 +93,7 @@
merging test.txt failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
+ [1]
$ cat test.txt
one