[checkmk-commits] [Checkmk/checkmk] 174dda: remove option to lie about the merge type