Commit 76499288 authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent 79719a61
......@@ -1009,16 +1009,25 @@ func δMerge(δ, δ2 map[Key]ΔValue) error {
δv := ΔValue{}
switch {
// XXX
// ø -> ø
case δv2.Old == VDEL && δv2.New == VDEL: // δv2 == hole
δv = δv1
// ø -> ø
// XXX
case δv1.Old == VDEL && δv1.New == VDEL: // δv1 == hole
δv = δv2
// ø -> x
// y -> ø
case δv2.New == VDEL:
δv.Old = δv2.Old
δv.New = δv1.New
// x -> ø
// ø -> y
default:
δv.Old = δv1.Old
δv.New = δv2.New
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment