From 3afa8830b5b7fb71168a6c7395b49f18f1463fb9 Mon Sep 17 00:00:00 2001 From: Ned Batchelder Date: Mon, 20 Apr 2015 12:22:05 -0400 Subject: I don't know how to resolve conflicts I guess. --- coverage/tracer.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'coverage') diff --git a/coverage/tracer.c b/coverage/tracer.c index 1ce5ed20..32f7c656 100644 --- a/coverage/tracer.c +++ b/coverage/tracer.c @@ -614,16 +614,13 @@ CTracer_handle_call(CTracer *self, PyFrameObject *frame) SHOWLOG(self->pdata_stack->depth, frame->f_lineno, filename, "skipped"); } -<<<<<<< local self->cur_entry.disposition = disposition; - self->cur_entry.last_line = -1; -======= + /* A call event is really a "start frame" event, and can happen for * re-entering a generator also. f_lasti is -1 for a true call, and a * real byte offset for a generator re-entry. */ self->cur_entry.last_line = (frame->f_lasti < 0) ? -1 : frame->f_lineno; ->>>>>>> other ok: ret = RET_OK; -- cgit v1.2.1