History of markResolved 1 change

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