History of parseConflicts 1 change

In src/markers.ts, lines 40–74 on f532c4266f21de52a84beccfdb040c25895c63d84a3f070d0a99689f030ff367. 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 40,74:src/markers.ts.