From 1115fb1f9bc6cab8bf802cbd7705899c8d68fa08 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 8 Mar 2024 13:38:46 -0400 Subject: [PATCH] fix indent for readability --- Git/UnionMerge.hs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Git/UnionMerge.hs b/Git/UnionMerge.hs index 9f738da844..ff3a6da534 100644 --- a/Git/UnionMerge.hs +++ b/Git/UnionMerge.hs @@ -87,11 +87,11 @@ mergeFile :: S.ByteString -> RawFilePath -> HashObjectHandle -> CatFileHandle -> mergeFile info file hashhandle h = case S8.words info of [_colonmode, _bmode, asha, bsha, _status] -> case filter (`notElem` nullShas) [Ref asha, Ref bsha] of - [] -> return Nothing - (sha:[]) -> use sha - shas -> use - =<< either return (hashBlob hashhandle . L8.unlines) - =<< calcMerge . zip shas <$> mapM getcontents shas + [] -> return Nothing + (sha:[]) -> use sha + shas -> use + =<< either return (hashBlob hashhandle . L8.unlines) + =<< calcMerge . zip shas <$> mapM getcontents shas _ -> return Nothing where use sha = return $ Just $