homepage: https://github.com/ElastiLotem/git-mediate
changelog-type: ''
hash: 44f01463b021083cd6a56bef22a018733b7ba15a60f4f91206832f3f6687b6d0
test-bench-deps: {}
maintainer: eyal.lotem@gmail.com
synopsis: Remove trivial conflict markers in a git repository
changelog: ''
basic-deps:
  unix: ! '>=2.7'
  base: ! '>=4.6 && <5'
  Diff: ! '>=0.3'
  filepath: ! '>=1.3'
  process: ! '>=1.2'
  ansi-terminal: ! '>=0.6.2'
  base-compat: ! '>=0.8.2 && <0.10'
  mtl: ! '>=2.1'
  optparse-applicative: ! '>=0.11 && <0.14'
  directory: ! '>=1.2'
all-versions:
- '1.0'
author: Eyal Lotem
latest: '1.0'
description-type: haddock
description: Remove trivial conflict markers in a git repository
license-name: GPL-2

homepage: https://github.com/Peaker/git-mediate
changelog-type: ''
hash: a2fac645317ba3d2dbc67e5e5e1e06d1d06fce29461f7725feb8b6221cf4dc8e
test-bench-deps: {}
maintainer: eyal.lotem@gmail.com
synopsis: Remove trivial conflict markers in a git repository
changelog: ''
basic-deps:
  unix: ! '>=2.7'
  base: ! '>=4.6 && <5'
  Diff: ! '>=0.3'
  filepath: ! '>=1.3'
  process: ! '>=1.2'
  ansi-terminal: ! '>=0.6.2'
  base-compat: ! '>=0.8.2 && <0.10'
  mtl: ! '>=2.1'
  optparse-applicative: ! '>=0.11 && <0.14'
  directory: ! '>=1.2'
all-versions:
- '1.0'
- '1.0.1'
author: Eyal Lotem
latest: '1.0.1'
description-type: haddock
description: Remove trivial conflict markers in a git repository
license-name: GPL-2

Update from Hackage at 2016-12-26T20:41:16Z
Update from Hackage at 2016-12-26T20:41:16Z
