[darcs-devel] [patch1862] resolve issue2550: apply only properly m... (and 2 more)

[Ganesh Sittampalam]

Ganesh Sittampalam <ganesh at earth.li> added the comment:

>   * resolve issue2550: apply only properly mangled resolutions, warn about any others

Would a test make sense for this new behaviour?

> data StandardResolution prim wX =

This would benefit from some haddocks. Not critical though, it's not too
hard to figure out what's what.

Otherwise fine. Above things are optional so I'll mark this as accepted now.

>   * move announceConflicts from D.R.Merge to D.R.Resolution
>   * store the raw unmangled parts of a conflict in StandardResolution

Fine

__________________________________
Darcs bug tracker <bugs at darcs.net>
<http://bugs.darcs.net/patch1862>
__________________________________