mirror of
https://github.com/unisonweb/unison.git
synced 2024-08-15 13:30:27 +03:00
0031542faf
This is for consistency with the `cmark` style. Now the blocks we still pretty-print ourselves will match the bulk of them that `cmark` produces.
1.1 KiB
1.1 KiB
scratch/main> builtins.merge
Done.
foo : Nat
foo = 5
bar : Nat
bar = 5
Loading changes detected in scratch.u.
I found and typechecked these definitions in scratch.u. If you
do an `add` or `update`, here's how your codebase would
change:
⍟ These new definitions are ok to `add`:
bar : Nat
foo : Nat
scratch/main> add
⍟ I've added these definitions:
bar : Nat
foo : Nat
foo : Nat
foo = 6
bar : Nat
bar = 7
Loading changes detected in scratch.u.
I found and typechecked these definitions in scratch.u. If you
do an `add` or `update`, here's how your codebase would
change:
⍟ These names already exist. You can `update` them to your
new definition:
bar : Nat
(The old definition is also named foo.)
foo : Nat
(The old definition is also named bar.)
scratch/main> update
Okay, I'm searching the branch for code that needs to be
updated...
Done.
scratch/main> view foo bar
bar : Nat
bar = 7
foo : Nat
foo = 6