Fix merge.

markshannon · markshannon · commit 67a5450422d3 · 2023-05-04T23:16:03.000+01:00
diff --git a/Python/ceval.c b/Python/ceval.c
@@ -784,7 +784,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
                next_instr points the current instruction without TARGET(). */
             opcode = next_instr->op.code;
             _PyErr_Format(tstate, PyExc_SystemError,
-                    PyUnstable_InterpreterFrame_GetLine(frame),  opcode);
+                          "XXX - merge s
                           frame->f_code->co_filename,
                           PyUnstable_InterpreterFrame_GetLine(frame),
                           opcode);
