From .
 * [new ref]                   HEAD       -> merge-attempt
From https://github.com/cms-sw/cmssw
 * [new ref]                   refs/pull/47811/head -> cms-sw/refs/pull/47811/head
Switched to branch 'merge-attempt'
Merge made by the 'ort' strategy.
 Configuration/HLT/python/autoCondHLT.py            |    6 +-
 HLTrigger/Configuration/python/HLT_FULL_cff.py     | 2583 +++++++++++++------
 HLTrigger/Configuration/python/HLT_GRun_cff.py     | 2308 ++++++++++++-----
 HLTrigger/Configuration/python/HLT_HIon_cff.py     |    4 +-
 HLTrigger/Configuration/python/HLT_PIon_cff.py     |    4 +-
 HLTrigger/Configuration/python/HLT_PRef_cff.py     |    6 +-
 HLTrigger/Configuration/python/HLT_Special_cff.py  |    6 +-
 .../python/HLTrigger_Datasets_GRun_cff.py          |  557 ++--
 HLTrigger/Configuration/tables/GRun.txt            |   64 +-
 HLTrigger/Configuration/tables/online_grun.txt     |   64 +-
 HLTrigger/Configuration/test/OnLine_HLT_FULL.py    | 2701 ++++++++++++++------
 HLTrigger/Configuration/test/OnLine_HLT_GRun.py    | 2386 ++++++++++++-----
 HLTrigger/Configuration/test/OnLine_HLT_HIon.py    |    4 +-
 HLTrigger/Configuration/test/OnLine_HLT_PIon.py    |    4 +-
 HLTrigger/Configuration/test/OnLine_HLT_PRef.py    |    6 +-
 HLTrigger/Configuration/test/OnLine_HLT_Special.py |    6 +-
 16 files changed, 7525 insertions(+), 3184 deletions(-)
Switched to branch 'from-CMSSW_15_1_X_2025-04-07-2300'