[darcs-devel] darcs patch: Added mergeFL and mergeFL_FL (and 4 more)

[Eric Y. Kow]

Sorry guys,

I'm not really in a position to review these properly.  I'm just going
to push these in and take your word for it.

Out of curiosity, though, what's the difference between :\./: and :\/:?
Also, what are Marked and Cancelled patches and their relationship with
Conflicted ones?  Cancelled patches, presumably, are patches which the
user has de-selected in a conflicting situation.  And what are the
Marked ones?

Anyway, if anybody wants to review them, I'm holding off until tomorrow.

-- 
Eric Kow                     http://www.loria.fr/~kow
PGP Key ID: 08AC04F9         Merci de corriger mon français.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 186 bytes
Desc: not available
Url : http://lists.osuosl.org/pipermail/darcs-devel/attachments/20070728/2d24f2d1/attachment.pgp