test-bundle: split each variant in there own section...
test-bundle: split each variant in there own section
Having conditional line matching for this kind of big block is quite
inconvenient to update. The new way should be simpler to maintain.
Differential Revision:
https://phab.mercurial-scm.org/D12075