Changes up to # 642da2636de2 · 521
See as swimlanes (independent work side by side)
oxy 0.8.0
v0.8.0
oxy 0.7.0
v0.7.0
oxy 0.6.0
v0.6.0
oxy 0.5.1
v0.5.1
Merge main into #125: keep both synopsis lines
doctor-trustkeyless-tagspaths-for-resolutions-and-amendv0.5.0v0.5.1v0.6.0
resolution
Marker-like text no longer blocks a conflict resolution
doctor-trustkeyless-tagsv0.5.0v0.5.1v0.6.0v0.7.0
A carried switch no longer says carried files were removed
carried-not-removeddoctor-trustkeyless-tagspaths-for-resolutions-and-amendv0.5.0v0.5.1v0.6.0v0.7.0