changeset 30287 | 86f4ef63d507 |
parent 30211 | 6b0741d6d234 |
child 30469 | ce3a133f71b3 |
--- a/tests/test-rebase-conflicts.t Wed Nov 02 18:45:53 2016 +0000 +++ b/tests/test-rebase-conflicts.t Wed Nov 02 18:59:29 2016 +0000 @@ -73,8 +73,6 @@ Try to continue without solving the conflict: $ hg rebase --continue - already rebased 3:3163e20567cc "L1" as 3e046f2ecedb - rebasing 4:46f0b057b5c0 "L2" abort: unresolved merge conflicts (see 'hg help resolve') [255]