diff options
Diffstat (limited to 'Annex')
| -rw-r--r-- | Annex/Branch.hs | 2 | ||||
| -rw-r--r-- | Annex/Init.hs | 2 | ||||
| -rw-r--r-- | Annex/Perms.hs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Annex/Branch.hs b/Annex/Branch.hs index 9d963f98b..af29b02b0 100644 --- a/Annex/Branch.hs +++ b/Annex/Branch.hs @@ -574,7 +574,7 @@ checkBranchDifferences ref = do <$> catFile ref differenceLog mydiffs <- annexDifferences <$> Annex.getGitConfig when (theirdiffs /= mydiffs) $ - giveup "Remote repository is tuned in incompatable way; cannot be merged with local repository." + giveup "Remote repository is tuned in incompatible way; cannot be merged with local repository." ignoreRefs :: [Git.Sha] -> Annex () ignoreRefs rs = do diff --git a/Annex/Init.hs b/Annex/Init.hs index 8a208fe2b..74274ad7f 100644 --- a/Annex/Init.hs +++ b/Annex/Init.hs @@ -119,7 +119,7 @@ uninitialize = do {- Will automatically initialize if there is already a git-annex - branch from somewhere. Otherwise, require a manual init - - to avoid git-annex accidentially being run in git + - to avoid git-annex accidentally being run in git - repos that did not intend to use it. - - Checks repository version and handles upgrades too. diff --git a/Annex/Perms.hs b/Annex/Perms.hs index 644402587..80eb71f37 100644 --- a/Annex/Perms.hs +++ b/Annex/Perms.hs @@ -148,7 +148,7 @@ thawPerms a = ifM crippledFileSystem ) {- Blocks writing to the directory an annexed file is in, to prevent the - - file accidentially being deleted. However, if core.sharedRepository + - file accidentally being deleted. However, if core.sharedRepository - is set, this is not done, since the group must be allowed to delete the - file. -} |