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

[Eric Kow]

On Mon, Sep 20, 2010 at 20:25:25 +0000, Ganesh Sittampalam wrote:
> Here's a patch to add the old text to conflict marking,
> as discussed on the mailing list.

How does this behave when you have nested or other fancy conflicts?

-- 
Eric Kow <http://www.nltg.brighton.ac.uk/home/Eric.Kow>
For a faster response, try +44 (0)1273 64 2905 or
xmpp:kowey at jabber.fr (Jabber or Google Talk only)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.osuosl.org/pipermail/darcs-users/attachments/20100921/7b2c6b1a/attachment.pgp>