summaryrefslogtreecommitdiff
path: root/Git/UnionMerge.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-10-12 12:20:45 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-10-12 12:20:45 -0400
commit078cdfc58d4083a19fa5f933e2e771d32475a48b (patch)
tree63864014d511ffc27abab8ce02c426723da8ec40 /Git/UnionMerge.hs
parenta0b643354907628a16f927935de0396382239c59 (diff)
fix slightly incorrect comment
Diffstat (limited to 'Git/UnionMerge.hs')
-rw-r--r--Git/UnionMerge.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/Git/UnionMerge.hs b/Git/UnionMerge.hs
index d77e9313c..55eff0f1e 100644
--- a/Git/UnionMerge.hs
+++ b/Git/UnionMerge.hs
@@ -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.