History of markResolved 1 change

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