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

[ deprecated, development, gpl, program ] [ Propose Tags ]
Deprecated. in favor of git-mediate
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 && <4.8), Diff (==0.3.*), directory (==1.2.*), filepath (==1.3.*), mtl (>=2.1 && <2.3), process (==1.2.*) [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
Uploaded by EyalLotem at Thu Dec 18 15:22:10 UTC 2014
Distributions NixOS:0.3.2.4
Executables resolve-trivial-conflicts
Downloads 4179 total (9 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 2015-06-07 [all 7 reports]

Downloads

Maintainer's Corner

For package maintainers and hackage trustees