History of parseConflicts 1 change

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