t4211: fix incorrect rebase at f8395edc (range-set: satisfy non-empty ranges invariant)