blob: bc8aa279e327782b510a05db3c6942f56a4add46 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
|
From: Sean Whitton <spwhitton@spwhitton.name>
Date: Tue, 25 Jul 2017 17:10:10 -0700
X-Dgit-Generated: 1.20151215-1.1 9d82f181d58f8538247a7efb96d1be16d131c158
Subject: patch Common.hs to avoid duplicate import errors
---
--- git-repair-1.20151215.orig/Common.hs
+++ git-repair-1.20151215/Common.hs
@@ -13,7 +13,6 @@ import Data.String.Utils as X hiding (jo
import Data.Monoid as X
import System.FilePath as X
-import System.Directory as X
import System.IO as X hiding (FilePath)
#ifndef mingw32_HOST_OS
import System.Posix.IO as X hiding (createPipe)
@@ -25,7 +24,7 @@ import Utility.Exception as X
import Utility.SafeCommand as X
import Utility.Process as X
import Utility.Path as X
-import Utility.Directory as X
+import Utility.Directory as X hiding (getFileSize)
import Utility.Monad as X
import Utility.Data as X
import Utility.Applicative as X
|
