equal
deleted
inserted
replaced
1242 o 1:488e1b7e7341 b |
1242 o 1:488e1b7e7341 b |
1243 | |
1243 | |
1244 o 0:b173517d0057 a |
1244 o 0:b173517d0057 a |
1245 |
1245 |
1246 $ hg rebase -d 0 -r 2 |
1246 $ hg rebase -d 0 -r 2 |
1247 abort: this rebase will cause divergences from: a82ac2b38757 |
|
1248 (to force the rebase please set experimental.evolution.allowdivergence=True) |
|
1249 [255] |
|
1250 $ hg rebase -d 0 -r 2 --config experimental.evolution.allowdivergence=True |
|
1251 rebasing 2:a82ac2b38757 "c" (c) |
1247 rebasing 2:a82ac2b38757 "c" (c) |
1252 $ hg log -G -r 'a': --hidden |
1248 $ hg log -G -r 'a': --hidden |
1253 o 5:69ad416a4a26 c |
1249 o 5:69ad416a4a26 c |
1254 | |
1250 | |
1255 | * 4:76be324c128b d |
1251 | * 4:76be324c128b d |