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:ko...@jabber.fr (Jabber or Google Talk only)

Attachment: signature.asc
Description: Digital signature

_______________________________________________
darcs-users mailing list
darcs-users@darcs.net
http://lists.osuosl.org/mailman/listinfo/darcs-users

Reply via email to