History of markResolved 1 change

In src/conflicts.ts, lines 81–97 on 1f7fc1e3ae4a1a993a20be977e826210317d3985d8cca2e5868286656ccf04f8. Every change that wrote or deleted one of these lines, or deleted a line from between them. Exact, because each line keeps its identity across edits; edits elsewhere in the file are not here. Also: oxy log -L 81,97:src/conflicts.ts.