ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-17 20:01:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

fixed merges

Browse Source
This commit is contained in:
Philip C Monk 2015-05-13 17:18:43 -04:00
parent 2b940d9346
commit 6cb1505288
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
base/arvo/clay.hoon
View File

@ -727,8 +727,11 @@
[%done ~ %null !>(~)] [%done ~ %null !>(~)]
=+ (~(get by mim.u.dok) a) =+ (~(get by mim.u.dok) a)
?^ - [%done ~ %mime !>(u.-)] ?^ - [%done ~ %mime !>(u.-)]
:^ %cast %mime %done :- ~ :+ %cast %mime
(need (read:ze %x [%ud let.dom] a)) =+ (need (need (read-x:ze let.dom a)))
?: ?=(%& -<)
[%done ~ p.-]
(lobe-to-silk:ze a p.-)
== ==
== ==
:: ::

4
base/lib/kiln/core.hook
View File

@ -151,11 +151,11 @@
^+ . ^+ .
(blab [ost %merg /kiln/[syd] our syd her sud gem] ~) (blab [ost %merg /kiln/[syd] our syd her sud gem] ~)
:: ::
++ fancy-merge :: send to self ++ fancy-merge :: send to self
|= [syd=desk her=@p sud=desk gem=?(%auto germ)] |= [syd=desk her=@p sud=desk gem=?(%auto germ)]
^+ +> ^+ +>
%- blab :_ ~ %- blab :_ ~
[ost %poke /kiln/fancy/[^syd] [our %kiln] %hood-merge [syd her sud gem]] [ost %poke /kiln/fancy/[^syd] [our %hood] %hood-merge [syd her sud gem]]
:: ::
++ spam ++ spam
|= mes=(list tank) |= mes=(list tank)