urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-11-29 14:57:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

clay: fix meet-conflict crash

Browse Source
This commit is contained in:
Philip Monk 2019-11-10 14:33:48 -08:00
parent 5c1d68bf44
commit e603681097
No known key found for this signature in database
GPG Key ID: B66E1F02604E44EC
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/arvo/sys/vane/clay.hoon
View File

@ -1370,7 +1370,7 @@
%- ~(uni by `(map path *)`can.bob-diffs) %- ~(uni by `(map path *)`can.bob-diffs)
`(map path *)`old.bob-diffs `(map path *)`old.bob-diffs
?^ bof ?^ bof
(error:he cas %meet-conflict >(~(run by `(map path *)`bof) ,~)< ~) (error:he cas %meet-conflict >(~(run by `(map path *)`bof) _~)< ~)
=/ old=(map path lobe) =/ old=(map path lobe)
%+ roll ~(tap by (~(uni by old.ali-diffs) old.bob-diffs)) %+ roll ~(tap by (~(uni by old.ali-diffs) old.bob-diffs))
=< .(old q.bas) =< .(old q.bas)