git-mediate 1.0 → 1.0.1

raw patch · 3 files changed

+13/−5 lines, 3 filesdep ~base

Dependency ranges changed: base

Files

Version.hs +8/−0
git-mediate.cabal +4/−4
git-mediate.hs +1/−1

+ Version.hs view

@@ -0,0 +1,8 @@+-- | Expose cabal package version as a string+module Version (versionString) where++import Paths_git_mediate (version)+import Data.Version (showVersion)++versionString :: String+versionString = showVersion version

git-mediate.cabal view

@@ -2,10 +2,10 @@ -- further documentation, see http://haskell.org/cabal/users-guide/  name:                git-mediate-version:             1.0+version:             1.0.1 synopsis:            Remove trivial conflict markers in a git repository description:         Remove trivial conflict markers in a git repository-homepage:            https://github.com/ElastiLotem/git-mediate+homepage:            https://github.com/Peaker/git-mediate license:             GPL-2 license-file:        LICENSE author:              Eyal Lotem@@ -18,11 +18,11 @@  source-repository head   type: git-  location: https://github.com/Elastilotem/git-mediate+  location: https://github.com/Peaker/git-mediate  executable git-mediate   main-is:             git-mediate.hs-  other-modules:       PPDiff, Opts+  other-modules:       PPDiff, Opts, Version   -- other-extensions:   build-depends:       base >=4.6 && <5                      , base-compat >= 0.8.2 && < 0.10

git-mediate.hs view

@@ -88,7 +88,7 @@         takeEnd count xs = drop (length xs - count) xs         unmatched xs = drop matchTop $ dropEnd matchBottom xs --- '>' -> ">>>>>>> "+-- '>' -> ">>>>>>>" markerPrefix :: Char -> String markerPrefix = replicate 7