@@ -603,20 +603,6 @@ There are four kinds of changes that may be made to a node in a `desk`.
604`%mut` mutates the file using raw data given by `p`.
604`%mut` mutates the file using raw data given by `p`.
606−#### `++mizu:clay`, merged state
609− ++ mizu ,[p=@u q=(map ,@ud tako) r=rang] :: new state
612−This is the input to the `%merg` kiss, which allows us to perform a
613−merge. The `p` is the number of the new head commit. The `q` is a map
614−from numbers to commit hashes. This is all the new numbered commits that
615−are to be inserted. The keys to this should always be the numbers from
616−`let.dom` plus one to `p`, inclusive. The `r` is the maps of all the new
617−commits and data. Since these are merged into the current state, no old
618−commits or data need be here.
620#### `++riff:clay`, request/desist
606#### `++riff:clay`, request/desist