tests/test-confused-revert.out
changeset 3095 25857e00af8e
parent 2214 6c6c0e5595a2
child 6298 53cbb33e1269
--- a/tests/test-confused-revert.out	Fri Sep 15 00:51:27 2006 +0200
+++ b/tests/test-confused-revert.out	Thu Sep 14 19:24:00 2006 -0700
@@ -17,7 +17,7 @@
 A b
 R a
 %%% revert should fail
-abort: working dir has two parents; you must specify the revision to revert to
+abort: uncommitted merge - please provide a specific revision
 %%% revert should be ok now
 undeleting a
 forgetting b