Deprecated

In favour of

resolve-trivial-conflicts

Remove trivial conflict markers in a git repository

https://github.com/ElastiLotem/resolve-trivial-conflicts

Version on this page:	0.3.2.1
LTS Haskell 9.21:	0.3.2.4
Stackage Nightly 2017-07-25:	0.3.2.4
Latest on Hackage:	0.3.2.4

See all snapshots resolve-trivial-conflicts appears in

GPL-2.0-only licensed by Eyal Lotem

Maintained by [email protected]

This version can be pinned in stack with:resolve-trivial-conflicts-0.3.2.1@sha256:bf7740671ae4719b9183cb83f843d34117b2f7a66bb243a30c2fcac0ba0b526e,1516

Module documentation for 0.3.2.1

There are no documented modules for this package.

Depends on 10 packages(full list with versions):

ansi-terminal, base, base-compat, Diff, directory, filepath, mtl, optparse-applicative, process, unix

Remove trivial conflict markers in a git repository