diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-01-01 13:22:38 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-01-01 13:22:38 -0400 |
| commit | 802f4615d785a520744c912446dab06569526a91 (patch) | |
| tree | a489061ac78c410b5e91d67de065dc6484ca1a4e /Annex/AutoMerge.hs | |
| parent | eb18baf6b84c59faee1b309bbe0721d0f11f4a70 (diff) | |
convert isPointerFile from Annex to IO
Diffstat (limited to 'Annex/AutoMerge.hs')
| -rw-r--r-- | Annex/AutoMerge.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Annex/AutoMerge.hs b/Annex/AutoMerge.hs index a332596f6..462e87e09 100644 --- a/Annex/AutoMerge.hs +++ b/Annex/AutoMerge.hs @@ -248,7 +248,7 @@ cleanConflictCruft resolvedks resolvedfs unstagedmap = do | S.member f fs || S.member (conflictCruftBase f) fs = anyM id [ pure (S.member i is) , inks <$> isAnnexLink f - , inks <$> isPointerFile f + , inks <$> liftIO (isPointerFile f) ] | otherwise = return False |