changeset 3092 | 25857e00af8e |
parent 2214 | 6c6c0e5595a2 |
--- a/tests/test-confused-revert.out +++ b/tests/test-confused-revert.out @@ -17,7 +17,7 @@ foo-b 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