History of parseConflicts 1 change

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