[Pkg-haskell-commits] [SCM] haskell-testpack branch, master, updated. debian/1.0.2-1-4-gb0d6b36

[John Goerzen]

The following commit has been merged in the master branch:
commit 640a993fd094f3ed0130b1e2bd668a1980b693dd
Author: John Goerzen <jgoerzen at complete.org>
Date:   Mon Aug 15 23:54:08 2005 +0100

    Fix long-standing bug in merge

diff --git a/MissingH/ConfigParser.hs b/MissingH/ConfigParser.hs
index 11ecccd..907f343 100644
--- a/MissingH/ConfigParser.hs
+++ b/MissingH/ConfigParser.hs
@@ -246,8 +246,9 @@ merge src dest =
         conv = optionxform dest
         convFM :: String -> CPOptions -> CPOptions
         convFM _ = listToFM . map (\x -> (conv (fst x), snd x)) . fmToList
+        mergesects a b = plusFM a b
         in
-	dest { content = plusFM (mapFM convFM (content src)) (content dest) }
+	dest { content = plusFM_C mergesects (mapFM convFM (content src)) (content dest) }
 
 {- | Utility to do a special case merge. -}
 readutil :: ConfigParser -> ParseOutput -> ConfigParser

-- 
haskell-testpack