Merge tag '1.20200102'

tagging package git-repair version 1.20200102

1 files changed, 5 insertions, 4 deletions

diff --git a/Common.hs b/Common.hs
index ab1de4e..7976789 100644
--- a/Common.hs
+++ b/Common.hs
@@ -5,12 +5,12 @@ module Common (module X) where
 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.Monad.IO.Class as X (liftIO)
 
 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 Data.Default as X
 
 import System.FilePath as X
 import System.IO as X hiding (FilePath)
@@ -18,6 +18,7 @@ import System.IO as X hiding (FilePath)
 import System.Posix.IO as X hiding (createPipe)
 #endif
 import System.Exit as X
+import System.PosixCompat.Files as X
 
 import Utility.Misc as X
 import Utility.Exception as X
@@ -28,8 +29,8 @@ import Utility.Directory as X hiding (getFileSize)
 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 hiding (fileSize)
 import Utility.FileSize as X
+import Utility.Split as X
+import Utility.FileSystemEncoding as X
 
 import Utility.PartialPrelude as X