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 4e0361b85..b0da07170 100644 --- a/Git/UnionMerge.hs +++ b/Git/UnionMerge.hs @@ -91,5 +91,5 @@ mergeFile g (info, file) = case filter (/= nullsha) [asha, bsha] of return $ Just $ update_index_line sha file where [_colonamode, _bmode, asha, bsha, _status] = words info - nullsha = take shaSize $ repeat '0' + nullsha = replicate shaSize '0' unionmerge = unlines . nub . lines |