diff options
Diffstat (limited to 'Git/UnionMerge.hs')
-rw-r--r-- | Git/UnionMerge.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Git/UnionMerge.hs b/Git/UnionMerge.hs index a9a51007f..d5323af1d 100644 --- a/Git/UnionMerge.hs +++ b/Git/UnionMerge.hs @@ -134,7 +134,7 @@ hashObject repo content = getSha subcmd $ do calcMerge :: [(Ref, [L.ByteString])] -> Either Ref [L.ByteString] calcMerge shacontents | null reuseable = Right $ new - | otherwise = Left $ fst $ head reuseable + | otherwise = Left $ fst $ Prelude.head reuseable where reuseable = filter (\c -> sorteduniq (snd c) == new) shacontents new = sorteduniq $ concat $ map snd shacontents |