[darcs-devel] [patch1409] merge Darcs.Patch.ConflictMarking into Darcs.Patch.Con...

[Guillaume Hoffmann]

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

ConflictMarking was only imported from modules that also
imported Conflict, so let's reduce the number of modules in Darcs
a little.

I'm not screening it for a couple of days in case there is a good
reason to keep these modules separate.

1 patch for repository http://darcs.net:

patch 21a1966fed8f0bf19b4d63d2207b004c0d28b0c4
Author: Guillaume Hoffmann <guillaumh at gmail.com>
Date:   Wed Nov 18 15:27:45 ART 2015
  * merge Darcs.Patch.ConflictMarking into Darcs.Patch.Conflict

----------
files: merge-darcs_patch_conflictmarking-into-darcs_patch_conflict.dpatch, patch-preview.txt, unnamed
messages: 18846
nosy: gh
status: needs-screening
title: merge Darcs.Patch.ConflictMarking into Darcs.Patch.Con...

__________________________________
Darcs bug tracker <bugs at darcs.net>
<http://bugs.darcs.net/patch1409>
__________________________________
-------------- next part --------------
A non-text attachment was scrubbed...
Name: patch-preview.txt
Type: text/x-darcs-patch
Size: 9757 bytes
Desc: not available
URL: <http://lists.osuosl.org/pipermail/darcs-devel/attachments/20151118/b4db4ef9/attachment-0002.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: merge-darcs_patch_conflictmarking-into-darcs_patch_conflict.dpatch
Type: application/x-darcs-patch
Size: 39255 bytes
Desc: not available
URL: <http://lists.osuosl.org/pipermail/darcs-devel/attachments/20151118/b4db4ef9/attachment-0003.bin>
-------------- next part --------------
.