unisonweb/unison
1
0
Fork 0
mirror of https://github.com/unisonweb/unison.git synced 2024-08-15 21:40:50 +03:00
Code Issues Projects Releases Wiki Activity

fix conflicted alias message 2 (#5071)

Browse Source 
Co-authored-by: aryairani <aryairani@users.noreply.github.com>
This commit is contained in:
Arya Irani 2024-06-11 09:40:43 -04:00 committed by GitHub
parent a45fc88fb1
commit 335512e331
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
unison-cli/src/Unison/CommandLine/OutputMessages.hs
View File

@ -1372,7 +1372,9 @@ notifyUser dir = \case
<> "or"
<> IP.makeExample' IP.delete
<> "all but one of the definitions; I'll use the remaining name when propagating updates."
<> "(You can `rename` it back after the merge.)"
<> "(You can"
<> IP.makeExample' IP.moveAll
<> "it back after the merge.)"
)
]
)

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

@ -977,7 +977,7 @@ project/alice> merge /bob
there's nothing for me to decide.
* `move` or `delete` all but one of the definitions; I'll
use the remaining name when propagating updates. (You can
`rename` it back after the merge.)
`move` it back after the merge.)
and then try merging again.