diff --git a/unison-cli/src/Unison/CommandLine/OutputMessages.hs b/unison-cli/src/Unison/CommandLine/OutputMessages.hs index d829100bc..fd3b51d97 100644 --- a/unison-cli/src/Unison/CommandLine/OutputMessages.hs +++ b/unison-cli/src/Unison/CommandLine/OutputMessages.hs @@ -225,7 +225,9 @@ notifyNumbered = \case <> IP.makeExample' IP.undo <> " or use a hash from " <> 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) diff --git a/unison-src/transcripts/merge.md b/unison-src/transcripts/merge.md index 90ad8955e..1d28320c8 100644 --- a/unison-src/transcripts/merge.md +++ b/unison-src/transcripts/merge.md @@ -1645,7 +1645,7 @@ project/carol> history ``` ```ucm:hide -.> project.delete project +scratch/main> project.delete project ``` ### Variables named `_` @@ -1701,7 +1701,3 @@ scratch/alice> update ```ucm scratch/alice> merge /bob ``` - -```ucm:hide -.> project.delete scratch -```