mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix slightly incorrect comment

Browse source
This commit is contained in:
Joey Hess 2012-10-12 12:20:45 -04:00
parent e05c21cb73
commit 06831e7754
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Git/UnionMerge.hs
View file

@ -86,7 +86,7 @@ mergeFile info file h repo = case filter (/= nullSha) [Ref asha, Ref bsha] of
-- split it into lines to union merge. Using the
-- FileSystemEncoding for this is a hack, but ensures there
-- are no decoding errors. Note that this works because
-- streamUpdateIndex sets fileEncoding on its write handle.
-- hashObject sets fileEncoding on its write handle.
getcontents s = lines . encodeW8 . L.unpack <$> catObject h s
{- Calculates a union merge between a list of refs, with contents.