[darcs-devel] [patch1577] added a comment to Darcs.Patch.Conflict.resolveConflicts (and one more)

[Guillaume Hoffmann]

New submission from Guillaume Hoffmann <guillaumh at gmail.com>:

OK for the comment, but the second patch looks really suspicious to me. 

It seems like in the definition of 'rcs' the case where
(resolveConflicts p) is null and the alternative case have been inverted?

I would suggest rollback this patch in screened ASAP.

----------
assignedto:  -> bf
nosy: +bf, ganesh
status: needs-review -> followup-requested

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