diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-07-15 03:12:05 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-07-15 03:12:05 -0400 |
| commit | e78475737636a5d1e0d0a36b475c300cc7bb56cc (patch) | |
| tree | 1d88de569e951b66ff5321eefaec49ad4b33bf89 /Git/UnionMerge.hs | |
| parent | 9bb797c0eae3c9d2f119a734762a6d5fa7321a80 (diff) | |
hlint tweaks
Did all sources except Remotes/* and Command/*
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 |