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

:update "merge method" clarification

Browse Source
This commit is contained in:
Anton Dyudin 2014-07-23 15:36:10 -07:00 committed by Anton Dyudin
parent cde3031388
commit d4cd1cdb47
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
main/bin/update.hoon
View File

@ -14,8 +14,11 @@
=+ lum=(~(auld ze est owr) gem who des sab)
?~ lum
^- gift
:+ %la %leaf
"{(trip des)} failed to apply, please rerun with a merge option"
:^ %la %rose [": " "" ""]
:~
leaf/"{(trip des)} failed to apply, please rerun with a merge option"
(skol -:!>(_germ))
==
?~ u.lum
`gift`[%la %leaf "{(trip des)} is up to date"]
`gift`[%ok des u.u.lum]