| changeset 42532 | 12243f15d53e |
| parent 42491 | 1474f5d84662 |
| child 42602 | c7d236b55a3e |
--- a/tests/test-strip.t Sun Jun 09 01:13:13 2019 +0530 +++ b/tests/test-strip.t Sun Jun 09 02:12:58 2019 +0530 @@ -275,6 +275,7 @@ ##strip not allowed with merge in progress $ hg strip 4 abort: outstanding uncommitted merge + (use 'hg commit' or 'hg merge --abort') [255] ##strip allowed --force with merge in progress $ hg strip 4 --force