ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2025-01-03 04:40:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

txt: don't conflict if identical changes

Browse Source
This commit is contained in:
Philip Monk 2020-06-01 20:46:43 -07:00
parent b191636276
commit 62889d78d1
No known key found for this signature in database
GPG Key ID: B66E1F02604E44EC
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/arvo/mar/txt.hoon
View File

@ -55,7 +55,7 @@
|=(cud/(urge cord) [i.bob cud])
%+ bind $(ali t.ali, p.i.bob (sub p.i.bob p.i.ali))
|=(cud/(urge cord) [i.ali cud])
::
::
%|
?: =(p.i.ali (lent p.i.bob))
%+ bind $(ali t.ali, bob t.bob)
@ -68,7 +68,12 @@
::
%|
?- -.i.bob
%| ~
%|
?. =(i.ali i.bob)
~
%+ bind $(ali t.ali, bob t.bob)
|=(cud/(urge cord) [i.ali cud])
::
%&
?: =(p.i.bob (lent p.i.ali))
%+ bind $(ali t.ali, bob t.bob)