mirror of
https://github.com/unisonweb/unison.git
synced 2024-09-11 02:25:39 +03:00
Fix merge transcript
This commit is contained in:
parent
1cd3f3cff8
commit
fa6c59e68a
@ -225,7 +225,9 @@ notifyNumbered = \case
|
|||||||
<> IP.makeExample' IP.undo
|
<> IP.makeExample' IP.undo
|
||||||
<> " or use a hash from "
|
<> " or use a hash from "
|
||||||
<> IP.makeExample' IP.branchReflog
|
<> IP.makeExample' IP.branchReflog
|
||||||
<> " to undo the results of this merge."
|
<> " with "
|
||||||
|
<> IP.makeExample' IP.reset
|
||||||
|
<> " to reset to a previous state."
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
(showDiffNamespace ShowNumbers ppe (BranchAtProjectPath destAbs) (BranchAtProjectPath destAbs) diffOutput)
|
(showDiffNamespace ShowNumbers ppe (BranchAtProjectPath destAbs) (BranchAtProjectPath destAbs) diffOutput)
|
||||||
|
@ -1645,7 +1645,7 @@ project/carol> history
|
|||||||
```
|
```
|
||||||
|
|
||||||
```ucm:hide
|
```ucm:hide
|
||||||
.> project.delete project
|
scratch/main> project.delete project
|
||||||
```
|
```
|
||||||
|
|
||||||
### Variables named `_`
|
### Variables named `_`
|
||||||
@ -1701,7 +1701,3 @@ scratch/alice> update
|
|||||||
```ucm
|
```ucm
|
||||||
scratch/alice> merge /bob
|
scratch/alice> merge /bob
|
||||||
```
|
```
|
||||||
|
|
||||||
```ucm:hide
|
|
||||||
.> project.delete scratch
|
|
||||||
```
|
|
||||||
|
Loading…
Reference in New Issue
Block a user