From: Joey Hess Date: Tue, 13 Aug 2024 15:47:37 +0000 (-0400) Subject: fix typo X-Git-Tag: archive/raspbian/10.20250416-2+rpi1~1^2~21^2~135 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=5c35b3d579a24d8e760d7ee3996639fc1964544b;p=git-annex.git fix typo --- diff --git a/Logs/Location.hs b/Logs/Location.hs index b360340281..afc0286df7 100644 --- a/Logs/Location.hs +++ b/Logs/Location.hs @@ -247,7 +247,7 @@ overLocationLogs' iv discarder keyaction = do Annex.Branch.overBranchFileContents getk (go iv) >>= \case Just r -> return r - Nothing -> giveup "This repository is read-only, and there are unmerged git-annex branches, which prevents operating on allu keys. (Set annex.merge-annex-branches to false to ignore the unmerged git-annex branches.)" + Nothing -> giveup "This repository is read-only, and there are unmerged git-annex branches, which prevents operating on all keys. (Set annex.merge-annex-branches to false to ignore the unmerged git-annex branches.)" -- Cannot import Logs.Cluster due to a cycle. -- Annex.clusters gets populated when starting up git-annex.