branch | stable |
changeset 48357 | 4f01821fa0ec |
parent 48356 | f1898680d713 |
child 48817 | 9120c0cd935c |
--- a/tests/test-unamend.t Mon Jan 24 21:12:19 2022 -0800 +++ b/tests/test-unamend.t Mon Jan 24 21:17:04 2022 -0800 @@ -443,8 +443,5 @@ A left $ hg amend $ hg unamend - $ hg st --rev 1 --rev . - A right - R left (known-bad-output !) - $ hg st --rev 2 --rev . - A left (missing-correct-output !) + abort: cannot unamend merge changeset + [10]