urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-11-28 22:33:06 +03:00
Code Issues Packages Projects Releases Wiki Activity

clay: print conflicts

Browse Source
This commit is contained in:
Philip Monk 2020-06-30 15:24:42 -07:00
parent 1adca22298
commit f4f1d0ab4b
No known key found for this signature in database
GPG Key ID: B66E1F02604E44EC
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2366,7 +2366,8 @@
|= [pax=path *]
=((~(got by new.dal) pax) (~(got by new.dob) pax))
?: &(?=(%mate germ) ?=(^ con))
[%| %mate-conflict ~]
=+ (turn ~(tap by `(map path *)`con) |=([path *] >[+<-]<))
[%| %mate-conflict -]
=/ old=(map path lobe) :: oldies but goodies
%+ roll ~(tap by (~(uni by old.dal) old.dob))
=< .(old q.bas)