History of markResolved 1 change

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