[darcs-users] [patch402] include old text in conflict marks

Ganesh Sittampalam bugs at darcs.net
Mon Sep 20 20:25:25 UTC 2010


New submission from Ganesh Sittampalam <ganesh at earth.li>:

Here's a patch to add the old text to conflict marking,
as discussed on the mailing list.

I didn't write any tests for this. In my defence, I didn't
break any either. Neither of these things is really ideal!

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

Wed Sep  8 06:46:09 BST 2010  Ganesh Sittampalam <ganesh at earth.li>
  * include old text in conflict marks

----------
files: include-old-text-in-conflict-marks.dpatch, unnamed
messages: 12592
nosy: ganesh
status: needs-screening
title: include old text in conflict marks

__________________________________
Darcs bug tracker <bugs at darcs.net>
<http://bugs.darcs.net/patch402>
__________________________________
-------------- next part --------------
A non-text attachment was scrubbed...
Name: include-old-text-in-conflict-marks.dpatch
Type: text/x-darcs-patch
Size: 43668 bytes
Desc: not available
URL: <http://lists.osuosl.org/pipermail/darcs-users/attachments/20100920/bd9d5e17/attachment-0001.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: unnamed
Type: application/octet-stream
Size: 5 bytes
Desc: not available
URL: <http://lists.osuosl.org/pipermail/darcs-users/attachments/20100920/bd9d5e17/attachment-0001.obj>


More information about the darcs-users mailing list