History of markResolved 1 change

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