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

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

Downloads

Maintainer's Corner

Package maintainers

For package maintainers and hackage trustees

Candidates

  • No Candidates
Versions [RSS] 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 && <0.6.3), base (>=4.6 && <4.8), Diff (>=0.3 && <0.4), directory (>=1.2 && <1.3), filepath (>=1.3 && <1.4), mtl (>=2.1 && <2.3), process (>=1.2 && <1.3) [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 2014-12-18T15:22:10Z
Distributions
Reverse Dependencies 1 direct, 0 indirect [details]
Executables resolve-trivial-conflicts
Downloads 9053 total (35 in the last 30 days)
Rating (no votes yet) [estimated by Bayesian average]
Your Rating
  • λ
  • λ
  • λ
Status Docs not available [build log]
Last success reported on 2015-06-07 [all 7 reports]