changeset 28188 | 6411140aeda9 |
parent 27974 | bb14a81ce647 |
child 28280 | dc6032a1d888 |
--- a/tests/test-rebase-obsolete.t Fri Feb 19 17:50:28 2016 +0100 +++ b/tests/test-rebase-obsolete.t Wed Feb 17 20:31:34 2016 +0000 @@ -771,7 +771,7 @@ phases: 8 draft unstable: 1 changesets $ hg rebase -s 10 -d 12 - abort: this rebase will cause divergence + abort: this rebase will cause divergences from: 121d9e3bc4c6 (to force the rebase please set rebase.allowdivergence=True) [255] $ hg log -G