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

update transcripts

Browse Source
This commit is contained in:
Mitchell Rosen 2024-05-07 09:59:51 -04:00
parent e20587de67
commit 90cc2b5bd9
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,7 +77,7 @@ project/bob> add
project/alice> merge /bob
I merged /bob into /alice.
I merged bob into alice.
project/alice> view foo bar
@ -166,7 +166,7 @@ project/bob> add
project/alice> merge /bob
I merged /bob into /alice.
I merged bob into alice.
project/alice> view foo bar
@ -278,7 +278,7 @@ project/bob> add
project/alice> merge /bob
I merged /bob into /alice.
I merged bob into alice.
project/alice> view foo bar
@ -415,7 +415,7 @@ project/bob> update
project/alice> merge /bob
I merged /bob into /alice.
I merged bob into alice.
project/alice> view foo bar baz
@ -553,7 +553,7 @@ project/bob> update
project/alice> merge /bob
I merged /bob into /alice.
I merged bob into alice.
project/alice> view foo bar baz
@ -648,7 +648,7 @@ project/bob> delete.term foo
project/alice> merge /bob
I merged /bob into /alice.
I merged bob into alice.
project/alice> view foo
@ -750,7 +750,7 @@ project/bob> add
project/alice> merge bob
I merged /bob into /alice.
I merged bob into alice.
project/alice> view foo bar baz
@ -895,7 +895,7 @@ project/bob> add
project/alice> merge /bob
I merged /bob into /alice.
I merged bob into alice.
```
## Merge failure: someone deleted something