diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2020-01-02 18:21:49 +0000 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2020-01-02 18:26:01 +0000 |
| commit | 1502c15352235371946db877a55da739d5fb7580 (patch) | |
| tree | 72053d3c14c8e6cfa38b80c890969d734773bc0e /debian/patches/patch-common.hs-to-avoid-duplicate-impor.patch | |
| parent | 82194f4c43cd5055d964b60a7c4244376e20f5af (diff) | |
| download | git-repair-1502c15352235371946db877a55da739d5fb7580.tar.gz | |
refresh remaining patch
Diffstat (limited to 'debian/patches/patch-common.hs-to-avoid-duplicate-impor.patch')
| -rw-r--r-- | debian/patches/patch-common.hs-to-avoid-duplicate-impor.patch | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/debian/patches/patch-common.hs-to-avoid-duplicate-impor.patch b/debian/patches/patch-common.hs-to-avoid-duplicate-impor.patch index bc8aa27..3761f70 100644 --- a/debian/patches/patch-common.hs-to-avoid-duplicate-impor.patch +++ b/debian/patches/patch-common.hs-to-avoid-duplicate-impor.patch @@ -6,17 +6,9 @@ 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 +--- a/Common.hs ++++ b/Common.hs +@@ -26,7 +25,7 @@ import Utility.Exception as X import Utility.SafeCommand as X import Utility.Process as X import Utility.Path as X |