[darcs-devel] [patch1709] throw an error if cleanly merging conflict resolutions fails

[Ganesh Sittampalam]

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

Actually attaching this patch too :-)

__________________________________
Darcs bug tracker <bugs at darcs.net>
<http://bugs.darcs.net/patch1709>
__________________________________
-------------- next part --------------
A non-text attachment was scrubbed...
Name: in-d_r_resolution_-throw-an-error-if-cleanly-merging-conflict-resolutions-fails.dpatch
Type: application/octet-stream
Size: 1544 bytes
Desc: not available
URL: <http://lists.osuosl.org/pipermail/darcs-devel/attachments/20180722/7b76849b/attachment.obj>