changeset 42470 | 1acaa9f37377 |
parent 40346 | 943248e47864 |
child 42491 | 1474f5d84662 |
--- a/tests/test-strip.t Fri Apr 26 00:48:12 2019 +0200 +++ b/tests/test-strip.t Fri Jun 14 18:25:14 2019 +0530 @@ -272,7 +272,12 @@ date: Thu Jan 01 00:00:00 1970 +0000 summary: c +##strip not allowed with merge in progress $ hg strip 4 + abort: outstanding uncommitted merge + [255] +##strip allowed --force with merge in progress + $ hg strip 4 --force 1 files updated, 0 files merged, 0 files removed, 0 files unresolved saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)