diff options
| author |  Edward Betts <edward@4angle.com> | 2017-02-11 09:38:49 +0000 |
|---|---|---|
| committer |  Joey Hess <joeyh@joeyh.name> | 2017-02-12 17:30:23 -0400 |
| commit | c6e4dcca673841f29449c8c2bf85fa41b31da12f (patch) | |
| tree | a0e16f9c52f6690be527044031607d97fae7d706 /Annex/Branch.hs | |
| parent | f765752568381ca2f003c08e9601fb2b5c397b5b (diff) | |
correct spelling mistakes
Diffstat (limited to 'Annex/Branch.hs')
| -rw-r--r-- | Annex/Branch.hs | 2 |
1 files changed, 1 insertions, 1 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 |