mirror of
https://github.com/unisonweb/unison.git
synced 2024-09-11 02:25:39 +03:00
rename merge2 to merge
This commit is contained in:
Mitchell Rosen
parent
d37bce3e7e
commit
2e9e5cf17c
@ -1706,7 +1706,7 @@ mergeOldInputPattern =
|
||||
mergeInputPattern :: InputPattern
|
||||
mergeInputPattern =
|
||||
InputPattern
|
||||
{ patternName = "merge2",
|
||||
{ patternName = "merge",
|
||||
aliases = [],
|
||||
visibility = I.Visible,
|
||||
args = [],
|
||||
|
||||
@ -34,7 +34,7 @@ bar = "bobs bar"
|
||||
|
||||
```ucm
|
||||
project/bob> add
|
||||
project/alice> merge2 /bob
|
||||
project/alice> merge /bob
|
||||
project/alice> view foo bar
|
||||
```
|
||||
|
||||
@ -75,7 +75,7 @@ bar = "bobs bar"
|
||||
|
||||
```ucm
|
||||
project/bob> add
|
||||
project/alice> merge2 /bob
|
||||
project/alice> merge /bob
|
||||
project/alice> view foo bar
|
||||
```
|
||||
|
||||
@ -121,7 +121,7 @@ bar = foo ++ foo
|
||||
|
||||
```ucm
|
||||
project/bob> add
|
||||
project/alice> merge2 /bob
|
||||
project/alice> merge /bob
|
||||
project/alice> view foo bar
|
||||
```
|
||||
|
||||
@ -176,7 +176,7 @@ baz = "bobs baz"
|
||||
|
||||
```ucm
|
||||
project/bob> update
|
||||
project/alice> merge2 /bob
|
||||
project/alice> merge /bob
|
||||
project/alice> view foo bar baz
|
||||
```
|
||||
|
||||
@ -229,7 +229,7 @@ bar = "bobs bar" ++ baz
|
||||
|
||||
```ucm
|
||||
project/bob> update
|
||||
project/alice> merge2 /bob
|
||||
project/alice> merge /bob
|
||||
project/alice> view foo bar baz
|
||||
```
|
||||
|
||||
@ -265,7 +265,7 @@ foo = "alices foo"
|
||||
project/alice> update
|
||||
project/main> branch bob
|
||||
project/bob> delete.term foo
|
||||
project/alice> merge2 /bob
|
||||
project/alice> merge /bob
|
||||
project/alice> view foo
|
||||
```
|
||||
|
||||
@ -285,7 +285,7 @@ project/main> builtins.mergeio
|
||||
```ucm
|
||||
project/main> branch alice
|
||||
project/main> branch bob
|
||||
project/alice> merge2 /bob
|
||||
project/alice> merge /bob
|
||||
```
|
||||
|
||||
```ucm:hide
|
||||
@ -313,7 +313,7 @@ foo = "foo"
|
||||
|
||||
```ucm
|
||||
project/alice> add
|
||||
project/alice> merge2 /bob
|
||||
project/alice> merge /bob
|
||||
```
|
||||
|
||||
```ucm:hide
|
||||
@ -341,7 +341,7 @@ foo = "foo"
|
||||
|
||||
```ucm
|
||||
project/bob> add
|
||||
project/alice> merge2 /bob
|
||||
project/alice> merge /bob
|
||||
```
|
||||
|
||||
```ucm:hide
|
||||
@ -380,7 +380,7 @@ bar = foo ++ foo
|
||||
|
||||
```ucm:error
|
||||
project/bob> add
|
||||
project/alice> merge2 /bob
|
||||
project/alice> merge /bob
|
||||
```
|
||||
|
||||
```ucm:hide
|
||||
@ -426,7 +426,7 @@ bar = foo ++ foo
|
||||
|
||||
```ucm:error
|
||||
project/bob> update
|
||||
project/alice> merge2 /bob
|
||||
project/alice> merge /bob
|
||||
```
|
||||
|
||||
```ucm:hide
|
||||
@ -482,7 +482,7 @@ baz = "bobs baz"
|
||||
|
||||
```ucm:error
|
||||
project/bob> update
|
||||
project/alice> merge2 /bob
|
||||
project/alice> merge /bob
|
||||
```
|
||||
|
||||
```ucm
|
||||
@ -528,7 +528,7 @@ unique type Foo = MkFoo Nat Text
|
||||
|
||||
```ucm:error
|
||||
project/bob> update
|
||||
project/alice> merge2 /bob
|
||||
project/alice> merge /bob
|
||||
```
|
||||
|
||||
```ucm:hide
|
||||
@ -569,7 +569,7 @@ unique type Foo = Baz Nat | BobQux Text
|
||||
|
||||
```ucm:error
|
||||
project/bob> update
|
||||
project/alice> merge2 /bob
|
||||
project/alice> merge /bob
|
||||
```
|
||||
|
||||
```ucm:hide
|
||||
@ -624,7 +624,7 @@ baz = "baz"
|
||||
|
||||
```ucm:error
|
||||
project/bob> add
|
||||
project/alice> merge2 /bob
|
||||
project/alice> merge /bob
|
||||
```
|
||||
|
||||
```ucm:hide
|
||||
@ -653,7 +653,7 @@ unique type MyNat = MyNat Nat
|
||||
|
||||
```ucm:error
|
||||
project/topic> add
|
||||
project/main> merge2 /topic
|
||||
project/main> merge /topic
|
||||
```
|
||||
|
||||
```ucm:hide
|
||||
@ -680,7 +680,7 @@ unique type Foo = Bar
|
||||
```ucm:error
|
||||
project/topic> add
|
||||
project/topic> alias.term Foo.Bar Foo.some.other.Alias
|
||||
project/main> merge2 /topic
|
||||
project/main> merge /topic
|
||||
```
|
||||
|
||||
```ucm:hide
|
||||
@ -707,7 +707,7 @@ unique type Foo = Bar
|
||||
```ucm:error
|
||||
project/topic> add
|
||||
project/topic> delete.term Foo.Bar
|
||||
project/main> merge2 /topic
|
||||
project/main> merge /topic
|
||||
```
|
||||
|
||||
```ucm:hide
|
||||
@ -734,7 +734,7 @@ structural type A.inner.X = Y Nat | Z Nat Nat
|
||||
|
||||
```ucm:error
|
||||
project/topic> add
|
||||
project/main> merge2 /topic
|
||||
project/main> merge /topic
|
||||
```
|
||||
|
||||
```ucm:hide
|
||||
@ -761,7 +761,7 @@ unique type Foo = Bar
|
||||
```ucm:error
|
||||
project/topic> add
|
||||
project/topic> alias.term Foo.Bar AliasOutsideFooNamespace
|
||||
project/main> merge2 /topic
|
||||
project/main> merge /topic
|
||||
```
|
||||
|
||||
```ucm:hide
|
||||
@ -789,7 +789,7 @@ lib.foo = 1
|
||||
|
||||
```ucm:error
|
||||
project/topic> add
|
||||
project/main> merge2 /topic
|
||||
project/main> merge /topic
|
||||
```
|
||||
|
||||
```ucm:hide
|
||||
|
||||
@ -14,7 +14,7 @@ project/main> branch alice
|
||||
Done. I've created the alice branch based off of main.
|
||||
|
||||
Tip: To merge your work back into the main branch, first
|
||||
`switch /main` then `merge2 /alice`
|
||||
`switch /main` then `merge /alice`
|
||||
|
||||
```
|
||||
```unison
|
||||
@ -47,7 +47,7 @@ project/main> branch bob
|
||||
Done. I've created the bob branch based off of main.
|
||||
|
||||
Tip: To merge your work back into the main branch, first
|
||||
`switch /main` then `merge2 /bob`
|
||||
`switch /main` then `merge /bob`
|
||||
|
||||
```
|
||||
```unison
|
||||
@ -75,7 +75,7 @@ project/bob> add
|
||||
|
||||
bar : Text
|
||||
|
||||
project/alice> merge2 /bob
|
||||
project/alice> merge /bob
|
||||
|
||||
I merged bob into alice.
|
||||
|
||||
@ -98,7 +98,7 @@ project/main> branch alice
|
||||
Done. I've created the alice branch based off of main.
|
||||
|
||||
Tip: To merge your work back into the main branch, first
|
||||
`switch /main` then `merge2 /alice`
|
||||
`switch /main` then `merge /alice`
|
||||
|
||||
```
|
||||
```unison
|
||||
@ -131,7 +131,7 @@ project/main> branch bob
|
||||
Done. I've created the bob branch based off of main.
|
||||
|
||||
Tip: To merge your work back into the main branch, first
|
||||
`switch /main` then `merge2 /bob`
|
||||
`switch /main` then `merge /bob`
|
||||
|
||||
```
|
||||
```unison
|
||||
@ -164,7 +164,7 @@ project/bob> add
|
||||
bar : Text
|
||||
foo : Text
|
||||
|
||||
project/alice> merge2 /bob
|
||||
project/alice> merge /bob
|
||||
|
||||
I merged bob into alice.
|
||||
|
||||
@ -213,7 +213,7 @@ project/main> branch alice
|
||||
Done. I've created the alice branch based off of main.
|
||||
|
||||
Tip: To merge your work back into the main branch, first
|
||||
`switch /main` then `merge2 /alice`
|
||||
`switch /main` then `merge /alice`
|
||||
|
||||
```
|
||||
```unison
|
||||
@ -248,7 +248,7 @@ project/main> branch bob
|
||||
Done. I've created the bob branch based off of main.
|
||||
|
||||
Tip: To merge your work back into the main branch, first
|
||||
`switch /main` then `merge2 /bob`
|
||||
`switch /main` then `merge /bob`
|
||||
|
||||
```
|
||||
```unison
|
||||
@ -276,7 +276,7 @@ project/bob> add
|
||||
|
||||
bar : Text
|
||||
|
||||
project/alice> merge2 /bob
|
||||
project/alice> merge /bob
|
||||
|
||||
I merged bob into alice.
|
||||
|
||||
@ -340,7 +340,7 @@ project/main> branch alice
|
||||
Done. I've created the alice branch based off of main.
|
||||
|
||||
Tip: To merge your work back into the main branch, first
|
||||
`switch /main` then `merge2 /alice`
|
||||
`switch /main` then `merge /alice`
|
||||
|
||||
```
|
||||
```unison
|
||||
@ -379,7 +379,7 @@ project/main> branch bob
|
||||
Done. I've created the bob branch based off of main.
|
||||
|
||||
Tip: To merge your work back into the main branch, first
|
||||
`switch /main` then `merge2 /bob`
|
||||
`switch /main` then `merge /bob`
|
||||
|
||||
```
|
||||
```unison
|
||||
@ -413,7 +413,7 @@ project/bob> update
|
||||
|
||||
Done.
|
||||
|
||||
project/alice> merge2 /bob
|
||||
project/alice> merge /bob
|
||||
|
||||
I merged bob into alice.
|
||||
|
||||
@ -478,7 +478,7 @@ project/main> branch alice
|
||||
Done. I've created the alice branch based off of main.
|
||||
|
||||
Tip: To merge your work back into the main branch, first
|
||||
`switch /main` then `merge2 /alice`
|
||||
`switch /main` then `merge /alice`
|
||||
|
||||
```
|
||||
```unison
|
||||
@ -517,7 +517,7 @@ project/main> branch bob
|
||||
Done. I've created the bob branch based off of main.
|
||||
|
||||
Tip: To merge your work back into the main branch, first
|
||||
`switch /main` then `merge2 /bob`
|
||||
`switch /main` then `merge /bob`
|
||||
|
||||
```
|
||||
```unison
|
||||
@ -551,7 +551,7 @@ project/bob> update
|
||||
|
||||
Done.
|
||||
|
||||
project/alice> merge2 /bob
|
||||
project/alice> merge /bob
|
||||
|
||||
I merged bob into alice.
|
||||
|
||||
@ -605,7 +605,7 @@ project/main> branch alice
|
||||
Done. I've created the alice branch based off of main.
|
||||
|
||||
Tip: To merge your work back into the main branch, first
|
||||
`switch /main` then `merge2 /alice`
|
||||
`switch /main` then `merge /alice`
|
||||
|
||||
```
|
||||
```unison
|
||||
@ -640,13 +640,13 @@ project/main> branch bob
|
||||
Done. I've created the bob branch based off of main.
|
||||
|
||||
Tip: To merge your work back into the main branch, first
|
||||
`switch /main` then `merge2 /bob`
|
||||
`switch /main` then `merge /bob`
|
||||
|
||||
project/bob> delete.term foo
|
||||
|
||||
Done.
|
||||
|
||||
project/alice> merge2 /bob
|
||||
project/alice> merge /bob
|
||||
|
||||
I merged bob into alice.
|
||||
|
||||
@ -666,16 +666,16 @@ project/main> branch alice
|
||||
Done. I've created the alice branch based off of main.
|
||||
|
||||
Tip: To merge your work back into the main branch, first
|
||||
`switch /main` then `merge2 /alice`
|
||||
`switch /main` then `merge /alice`
|
||||
|
||||
project/main> branch bob
|
||||
|
||||
Done. I've created the bob branch based off of main.
|
||||
|
||||
Tip: To merge your work back into the main branch, first
|
||||
`switch /main` then `merge2 /bob`
|
||||
`switch /main` then `merge /bob`
|
||||
|
||||
project/alice> merge2 /bob
|
||||
project/alice> merge /bob
|
||||
|
||||
😶
|
||||
|
||||
@ -692,14 +692,14 @@ project/main> branch alice
|
||||
Done. I've created the alice branch based off of main.
|
||||
|
||||
Tip: To merge your work back into the main branch, first
|
||||
`switch /main` then `merge2 /alice`
|
||||
`switch /main` then `merge /alice`
|
||||
|
||||
project/main> branch bob
|
||||
|
||||
Done. I've created the bob branch based off of main.
|
||||
|
||||
Tip: To merge your work back into the main branch, first
|
||||
`switch /main` then `merge2 /bob`
|
||||
`switch /main` then `merge /bob`
|
||||
|
||||
```
|
||||
```unison
|
||||
@ -727,7 +727,7 @@ project/alice> add
|
||||
|
||||
foo : Text
|
||||
|
||||
project/alice> merge2 /bob
|
||||
project/alice> merge /bob
|
||||
|
||||
😶
|
||||
|
||||
@ -744,14 +744,14 @@ project/main> branch alice
|
||||
Done. I've created the alice branch based off of main.
|
||||
|
||||
Tip: To merge your work back into the main branch, first
|
||||
`switch /main` then `merge2 /alice`
|
||||
`switch /main` then `merge /alice`
|
||||
|
||||
project/main> branch bob
|
||||
|
||||
Done. I've created the bob branch based off of main.
|
||||
|
||||
Tip: To merge your work back into the main branch, first
|
||||
`switch /main` then `merge2 /bob`
|
||||
`switch /main` then `merge /bob`
|
||||
|
||||
```
|
||||
```unison
|
||||
@ -779,7 +779,7 @@ project/bob> add
|
||||
|
||||
foo : Text
|
||||
|
||||
project/alice> merge2 /bob
|
||||
project/alice> merge /bob
|
||||
|
||||
I merged bob into alice.
|
||||
|
||||
@ -822,7 +822,7 @@ project/main> branch alice
|
||||
Done. I've created the alice branch based off of main.
|
||||
|
||||
Tip: To merge your work back into the main branch, first
|
||||
`switch /main` then `merge2 /alice`
|
||||
`switch /main` then `merge /alice`
|
||||
|
||||
project/alice> delete.term foo
|
||||
|
||||
@ -833,7 +833,7 @@ project/main> branch bob
|
||||
Done. I've created the bob branch based off of main.
|
||||
|
||||
Tip: To merge your work back into the main branch, first
|
||||
`switch /main` then `merge2 /bob`
|
||||
`switch /main` then `merge /bob`
|
||||
|
||||
```
|
||||
```unison
|
||||
@ -861,7 +861,7 @@ project/bob> add
|
||||
|
||||
bar : Text
|
||||
|
||||
project/alice> merge2 /bob
|
||||
project/alice> merge /bob
|
||||
|
||||
I couldn't automatically merge bob into alice. However, I've
|
||||
added the definitions that need attention to the top of
|
||||
@ -912,7 +912,7 @@ project/main> branch alice
|
||||
Done. I've created the alice branch based off of main.
|
||||
|
||||
Tip: To merge your work back into the main branch, first
|
||||
`switch /main` then `merge2 /alice`
|
||||
`switch /main` then `merge /alice`
|
||||
|
||||
```
|
||||
```unison
|
||||
@ -947,7 +947,7 @@ project/main> branch bob
|
||||
Done. I've created the bob branch based off of main.
|
||||
|
||||
Tip: To merge your work back into the main branch, first
|
||||
`switch /main` then `merge2 /bob`
|
||||
`switch /main` then `merge /bob`
|
||||
|
||||
```
|
||||
```unison
|
||||
@ -976,7 +976,7 @@ project/bob> update
|
||||
|
||||
Done.
|
||||
|
||||
project/alice> merge2 /bob
|
||||
project/alice> merge /bob
|
||||
|
||||
I couldn't automatically merge bob into alice. However, I've
|
||||
added the definitions that need attention to the top of
|
||||
@ -1030,7 +1030,7 @@ project/main> branch alice
|
||||
Done. I've created the alice branch based off of main.
|
||||
|
||||
Tip: To merge your work back into the main branch, first
|
||||
`switch /main` then `merge2 /alice`
|
||||
`switch /main` then `merge /alice`
|
||||
|
||||
```
|
||||
```unison
|
||||
@ -1076,7 +1076,7 @@ project/main> branch bob
|
||||
Done. I've created the bob branch based off of main.
|
||||
|
||||
Tip: To merge your work back into the main branch, first
|
||||
`switch /main` then `merge2 /bob`
|
||||
`switch /main` then `merge /bob`
|
||||
|
||||
```
|
||||
```unison
|
||||
@ -1113,7 +1113,7 @@ project/bob> update
|
||||
|
||||
Done.
|
||||
|
||||
project/alice> merge2 /bob
|
||||
project/alice> merge /bob
|
||||
|
||||
I couldn't automatically merge bob into alice. However, I've
|
||||
added the definitions that need attention to the top of
|
||||
@ -1178,7 +1178,7 @@ project/main> branch alice
|
||||
Done. I've created the alice branch based off of main.
|
||||
|
||||
Tip: To merge your work back into the main branch, first
|
||||
`switch /main` then `merge2 /alice`
|
||||
`switch /main` then `merge /alice`
|
||||
|
||||
```
|
||||
```unison
|
||||
@ -1212,7 +1212,7 @@ project/main> branch bob
|
||||
Done. I've created the bob branch based off of main.
|
||||
|
||||
Tip: To merge your work back into the main branch, first
|
||||
`switch /main` then `merge2 /bob`
|
||||
`switch /main` then `merge /bob`
|
||||
|
||||
```
|
||||
```unison
|
||||
@ -1241,7 +1241,7 @@ project/bob> update
|
||||
|
||||
Done.
|
||||
|
||||
project/alice> merge2 /bob
|
||||
project/alice> merge /bob
|
||||
|
||||
I couldn't automatically merge bob into alice. However, I've
|
||||
added the definitions that need attention to the top of
|
||||
@ -1288,7 +1288,7 @@ project/main> branch alice
|
||||
Done. I've created the alice branch based off of main.
|
||||
|
||||
Tip: To merge your work back into the main branch, first
|
||||
`switch /main` then `merge2 /alice`
|
||||
`switch /main` then `merge /alice`
|
||||
|
||||
```
|
||||
```unison
|
||||
@ -1322,7 +1322,7 @@ project/main> branch bob
|
||||
Done. I've created the bob branch based off of main.
|
||||
|
||||
Tip: To merge your work back into the main branch, first
|
||||
`switch /main` then `merge2 /bob`
|
||||
`switch /main` then `merge /bob`
|
||||
|
||||
```
|
||||
```unison
|
||||
@ -1345,7 +1345,7 @@ project/bob> update
|
||||
|
||||
Done.
|
||||
|
||||
project/alice> merge2 /bob
|
||||
project/alice> merge /bob
|
||||
|
||||
I couldn't automatically merge bob into alice. However, I've
|
||||
added the definitions that need attention to the top of
|
||||
@ -1403,7 +1403,7 @@ project/main> branch alice
|
||||
Done. I've created the alice branch based off of main.
|
||||
|
||||
Tip: To merge your work back into the main branch, first
|
||||
`switch /main` then `merge2 /alice`
|
||||
`switch /main` then `merge /alice`
|
||||
|
||||
```
|
||||
```unison
|
||||
@ -1444,7 +1444,7 @@ project/main> branch bob
|
||||
Done. I've created the bob branch based off of main.
|
||||
|
||||
Tip: To merge your work back into the main branch, first
|
||||
`switch /main` then `merge2 /bob`
|
||||
`switch /main` then `merge /bob`
|
||||
|
||||
```
|
||||
```unison
|
||||
@ -1472,7 +1472,7 @@ project/bob> add
|
||||
|
||||
baz : Text
|
||||
|
||||
project/alice> merge2 /bob
|
||||
project/alice> merge /bob
|
||||
|
||||
On alice, bar and foo are not aliases, but they used to be.
|
||||
|
||||
@ -1488,7 +1488,7 @@ project/main> branch topic
|
||||
Done. I've created the topic branch based off of main.
|
||||
|
||||
Tip: To merge your work back into the main branch, first
|
||||
`switch /main` then `merge2 /topic`
|
||||
`switch /main` then `merge /topic`
|
||||
|
||||
project/main> alias.type builtin.Nat MyNat
|
||||
|
||||
@ -1519,7 +1519,7 @@ project/topic> add
|
||||
|
||||
type MyNat
|
||||
|
||||
project/main> merge2 /topic
|
||||
project/main> merge /topic
|
||||
|
||||
There's a merge conflict on MyNat, but it's a builtin on one
|
||||
or both branches. We can't yet handle merge conflicts on
|
||||
@ -1536,7 +1536,7 @@ project/main> branch topic
|
||||
Done. I've created the topic branch based off of main.
|
||||
|
||||
Tip: To merge your work back into the main branch, first
|
||||
`switch /main` then `merge2 /topic`
|
||||
`switch /main` then `merge /topic`
|
||||
|
||||
```
|
||||
```unison
|
||||
@ -1567,7 +1567,7 @@ project/topic> alias.term Foo.Bar Foo.some.other.Alias
|
||||
|
||||
Done.
|
||||
|
||||
project/main> merge2 /topic
|
||||
project/main> merge /topic
|
||||
|
||||
On topic, Foo.Bar and Foo.some.other.Alias are aliases. Every
|
||||
type declaration must have exactly one name for each
|
||||
@ -1584,7 +1584,7 @@ project/main> branch topic
|
||||
Done. I've created the topic branch based off of main.
|
||||
|
||||
Tip: To merge your work back into the main branch, first
|
||||
`switch /main` then `merge2 /topic`
|
||||
`switch /main` then `merge /topic`
|
||||
|
||||
```
|
||||
```unison
|
||||
@ -1615,7 +1615,7 @@ project/topic> delete.term Foo.Bar
|
||||
|
||||
Done.
|
||||
|
||||
project/main> merge2 /topic
|
||||
project/main> merge /topic
|
||||
|
||||
Missing constructor name.
|
||||
|
||||
@ -1630,7 +1630,7 @@ project/main> branch topic
|
||||
Done. I've created the topic branch based off of main.
|
||||
|
||||
Tip: To merge your work back into the main branch, first
|
||||
`switch /main` then `merge2 /topic`
|
||||
`switch /main` then `merge /topic`
|
||||
|
||||
```
|
||||
```unison
|
||||
@ -1660,7 +1660,7 @@ project/topic> add
|
||||
structural type A
|
||||
structural type A.inner.X
|
||||
|
||||
project/main> merge2 /topic
|
||||
project/main> merge /topic
|
||||
|
||||
Nested decl alias.
|
||||
|
||||
@ -1675,7 +1675,7 @@ project/main> branch topic
|
||||
Done. I've created the topic branch based off of main.
|
||||
|
||||
Tip: To merge your work back into the main branch, first
|
||||
`switch /main` then `merge2 /topic`
|
||||
`switch /main` then `merge /topic`
|
||||
|
||||
```
|
||||
```unison
|
||||
@ -1706,7 +1706,7 @@ project/topic> alias.term Foo.Bar AliasOutsideFooNamespace
|
||||
|
||||
Done.
|
||||
|
||||
project/main> merge2 /topic
|
||||
project/main> merge /topic
|
||||
|
||||
Stray constructor.
|
||||
|
||||
@ -1722,7 +1722,7 @@ project/main> branch topic
|
||||
Done. I've created the topic branch based off of main.
|
||||
|
||||
Tip: To merge your work back into the main branch, first
|
||||
`switch /main` then `merge2 /topic`
|
||||
`switch /main` then `merge /topic`
|
||||
|
||||
```
|
||||
```unison
|
||||
@ -1750,7 +1750,7 @@ project/topic> add
|
||||
|
||||
lib.foo : Nat
|
||||
|
||||
project/main> merge2 /topic
|
||||
project/main> merge /topic
|
||||
|
||||
Defns in lib
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user