resolve-trivial-conflicts: Remove trivial conflict markers in a git repository

[ deprecated, development, gpl, program ] [ Propose Tags ]
Deprecated. in favor of git-mediate

Remove trivial conflict markers in a git repository

Versions [faq] 0.2, 0.2.0.1, 0.2.0.2, 0.3, 0.3.0.1, 0.3.0.2, 0.3.1, 0.3.1.1, 0.3.1.2, 0.3.2, 0.3.2.1, 0.3.2.2, 0.3.2.3, 0.3.2.4
Dependencies ansi-terminal (>=0.6.2), base (>=4.6 && <5), base-compat (>=0.8.2 && <0.10), Diff (>=0.3), directory (>=1.2), filepath (>=1.3), mtl (>=2.1), optparse-applicative (>=0.11 && <0.14), process (>=1.2), unix (>=2.7) [details]
License GPL-2.0-only
Author Eyal Lotem
Maintainer eyal.lotem@gmail.com
Category Development
Home page https://github.com/ElastiLotem/resolve-trivial-conflicts
Source repo head: git clone https://github.com/Elastilotem/resolve-trivial-conflicts
Uploaded by EyalLotem at Sat Oct 29 21:30:02 UTC 2016
Distributions NixOS:0.3.2.4
Executables resolve-trivial-conflicts
Downloads 4445 total (246 in the last 30 days)
Rating (no votes yet) [estimated by rule of succession]
Your Rating
  • λ
  • λ
  • λ
Status Hackage Matrix CI
Docs not available [build log]
Last success reported on 2016-11-18 [all 7 reports]

Downloads

Maintainer's Corner

For package maintainers and hackage trustees