branches and merging

Cabal has the following branches: HEAD, in darcs.haskell.org:/cabal, used by GHC HEAD 1.1.6, in darcs.haskell.org/cabal-branches/cabal-1.1.6 GHC 6.6 branch, in darcs.haskell.org/ghc-6.6/packages/Cabal The official 1.1.6 is diverging from GHC's 6.6 version. We should merge the two - Duncan would you like to take a look and see if you can pull from GHC's branch into 1.1.6, and then we can use 1.1.6 in GHC 6.6? Also I just noticed that Ross's patch Mon Nov 20 09:25:26 GMT 2006 Ross Paterson * trim trailing spaces (including CRs) from all input lines fixes #117 http://hackage.haskell.org/trac/hackage/ticket/117, and could easily be merged into 1.1.6. Cheers, Simon