mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

add missing space

Browse source
This commit is contained in:
Joey Hess 2020-12-17 15:58:14 -04:00
parent f2ecc6e0da
commit a4451ac391
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Annex/Export.hs
View file

@ -47,6 +47,6 @@ warnExportImportConflict r = do
True -> "exported to and/or imported from" True -> "exported to and/or imported from"
False -> "exported to" False -> "exported to"
toplevelWarning True $ toplevelWarning True $
"Conflict detected. Different trees have been " ++ ops ++ "Conflict detected. Different trees have been " ++ ops ++ " " ++
Remote.name r ++ Remote.name r ++
". Use git-annex export to resolve this conflict." ". Use git-annex export to resolve this conflict."