unisonweb/unison
1
0
Fork 0
mirror of https://github.com/unisonweb/unison.git synced 2024-09-11 02:25:39 +03:00
Code Issues Projects Releases Wiki Activity

regenerate merge.md output

Browse Source
This commit is contained in:
Mitchell Rosen 2024-05-14 09:30:23 -04:00
parent 5dcf56dc78
commit f80b07db81
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
unison-src/transcripts/merge.output.md
View File

@ -491,9 +491,6 @@ project/alice> merge /bob
```
```unison:added-by-ucm scratch.u
-- The definitions below are not conflicted, but they each depend on one or more
-- conflicted definitions above.
bar : Text
bar =
use Text ++
@ -535,9 +532,6 @@ project/alice> merge /bob
```
```unison:added-by-ucm scratch.u
-- The definitions below are not conflicted, but they each depend on one or more
-- conflicted definitions above.
bar : Text
bar =
use Text ++
@ -1143,8 +1137,8 @@ bob = 100
```ucm
project/alice> merge /bob
There's a type or term directly in the `lib` namespace, but I
expected only library dependencies to be in there. Please
remove it before merging.
On alice, there's a type or term directly in the `lib`
namespace, but I expected only library dependencies to be in
there. Please remove it before merging.
```