@hackage git-mediate1.0.4

Remove trivial conflict markers in a git repository

Remove trivial conflict markers in a git repository