diff options
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 |