tests/test-merge-revert2.t
changeset 12316 4134686b83e1
parent 12279 28e2e3804f2e
child 15501 2371f4aea665
--- a/tests/test-merge-revert2.t	Thu Sep 16 16:12:26 2010 -0500
+++ b/tests/test-merge-revert2.t	Thu Sep 16 17:51:32 2010 -0500
@@ -48,6 +48,7 @@
   merging file1 failed!
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges
+  [1]
 
   $ hg diff --nodates
   diff -r dfab7f3c2efb file1