OXYGENHUB

History of resolveRegion 1 change

In src/markers.ts, lines 82–92 on v0.16.0. 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 82,92:src/markers.ts.

Milestone 0.5: conflict editor CodeLens over oxy markers, keep-this-candidate for tree conflicts, mark resolved, commit resolution label
Andy McCall ·
✔ 25103dddd993