History of markResolved 1 change

In src/conflicts.ts, lines 81–97 on 390a91e2e39cdec491dbfe0074822850c5003e4393b501dc4c5469cd8c53bd0c. 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.