cli rebase: add tests for weird ancestry, fix an assumption in a comment
#7986
| Job | Run time |
|---|---|
| 4m 43s | |
| 24s | |
| 5m 50s | |
| 23s | |
| 6m 26s | |
| 5m 39s | |
| 49s | |
| 2m 25s | |
| 22s | |
| 28s | |
| 14s | |
| 27m 43s |