@hackage resolve-trivial-conflicts0.2.0.1

Remove trivial conflict markers in a git repository

Categories
- Development
License
GPL-2.0-only
Maintainer
eyal.lotem@gmail.com
Links
Versions
- 0.3.2.4 Tue, 20 Dec 2016
- 0.3.2.3 Sat, 29 Oct 2016
- 0.3.2.2 Sat, 16 Jan 2016
- 0.3.2.1 Fri, 25 Dec 2015
- 0.3.2 Thu, 24 Dec 2015
- 0.3.1.2 Sun, 20 Sep 2015

Deprecated
This package has been deprecated in favour of
- @hackage/git-mediate
Dependencies (0)
- base >=4.6 && <4.8
- directory >=1.2 && <1.3
- filepath >=1.3 && <1.4
- mtl >=2.1 && <2.3
- process >=1.2 && <1.3
- Diff >=0.3 && <0.4
Dependents (1)
@hackage/acme-everything

Remove trivial conflict markers in a git repository