--- a/tests/test-rebase-obsolete.t Fri Feb 26 17:15:49 2016 +0000
+++ b/tests/test-rebase-obsolete.t Sat Feb 27 18:02:12 2016 +0100
@@ -772,7 +772,7 @@
unstable: 1 changesets
$ hg rebase -s 10 -d 12
abort: this rebase will cause divergences from: 121d9e3bc4c6
- (to force the rebase please set rebase.allowdivergence=True)
+ (to force the rebase please set experimental.allowdivergence=True)
[255]
$ hg log -G
@ 15:73568ab6879d bar foo
@@ -791,9 +791,9 @@
|
o 0:4a2df7238c3b A
-With rebase.allowdivergence=True, rebase can create divergence
+With experimental.allowdivergence=True, rebase can create divergence
- $ hg rebase -s 10 -d 12 --config rebase.allowdivergence=True
+ $ hg rebase -s 10 -d 12 --config experimental.allowdivergence=True
rebasing 10:121d9e3bc4c6 "P"
rebasing 15:73568ab6879d "bar foo" (tip)
$ hg summary