Deprecated

In favour of
git-mediate

resolve-trivial-conflicts

Remove trivial conflict markers in a git repository

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

Version on this page:0.3.1.2
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.1.2@sha256:8751196b2f51f916e9241cde93f5cbe38e9f6b0077befbe193211716e2aab03c,1450

Module documentation for 0.3.1.2

There are no documented modules for this package.

Remove trivial conflict markers in a git repository