diff options
author | Joey Hess <joey@kitenet.net> | 2014-10-12 14:32:56 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2014-10-12 14:32:56 -0400 |
commit | efef527d5b2e42e261fa7af6947aad6553426ebe (patch) | |
tree | 082a5dad993557e9dffd76a69d4087371da8ed42 /Common.hs | |
parent | ab1cf3570207bd08ae0abbba183a8c570c0361f5 (diff) | |
download | git-repair-efef527d5b2e42e261fa7af6947aad6553426ebe.tar.gz |
Merge from git-annex.
Includes changing to new exceptions library, and some whitespace fixes.
Diffstat (limited to 'Common.hs')
-rw-r--r-- | Common.hs | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -6,16 +6,15 @@ import Control.Monad as X import Control.Monad.IfElse as X import Control.Applicative as X import "mtl" Control.Monad.State.Strict as X (liftIO) -import Control.Exception.Extensible as X (IOException) import Data.Maybe as X import Data.List as X hiding (head, tail, init, last) import Data.String.Utils as X hiding (join) +import Data.Monoid as X import System.FilePath as X import System.Directory as X import System.IO as X hiding (FilePath) -import System.PosixCompat.Files as X #ifndef mingw32_HOST_OS import System.Posix.IO as X #endif @@ -31,5 +30,6 @@ import Utility.Monad as X import Utility.Data as X import Utility.Applicative as X import Utility.FileSystemEncoding as X +import Utility.PosixFiles as X import Utility.PartialPrelude as X |