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

transcript output merge conflict

Browse Source
This commit is contained in:
Arya Irani 2024-05-18 23:42:51 -04:00
parent 8b762c7908
commit 1be90b1414
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
unison-src/transcripts/definition-diff-api.output.md
View File

@ -54,8 +54,8 @@ diffs/main> branch.create new
Done. I've created the new branch based off of main.
Tip: Use `merge /new /main` to merge your work back into the
main branch.
Tip: To merge your work back into the main branch, first
`switch /main` then `merge /new`.
```
```unison