-
Notifications
You must be signed in to change notification settings - Fork 273
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
179e131
commit 581e2e1
Showing
2 changed files
with
36 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
Also fixes #1519 (it's the same issue). | ||
|
||
```ucm | ||
.> builtins.merge | ||
``` | ||
|
||
```unison | ||
foo.+.doc : Nat | ||
foo.+.doc = 10 | ||
``` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
Also fixes #1519 (it's the same issue). | ||
|
||
```ucm | ||
.> builtins.merge | ||
Done. | ||
``` | ||
```unison | ||
foo.+.doc : Nat | ||
foo.+.doc = 10 | ||
``` | ||
|
||
```ucm | ||
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`: | ||
foo.+.doc : Nat | ||
``` |