Deprecated

In favour of
git-mediate

resolve-trivial-conflicts

Remove trivial conflict markers in a git repository

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

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.4@sha256:765b4d458878bee42a13e58cf2290a03870e66f61cbebb0bdcc30755ccec39b0,1422

Module documentation for 0.3.2.4

There are no documented modules for this package.

Remove trivial conflict markers in a git repository