On Sun, Apr 12, 2009 at 11:49:08 +0200, Daniel Carrera wrote: > In this instance git happily merges and darcs sees a conflict. Darcs > behaviour is correct. There is no way for the program to know if two > identical changes are a conflict or not.
Note that the new darcs-2 formalism treats identical changes as non-conflicting (or rather, I think the case is that it sees them as conflicting, but treats them as "intangible" conflicts, so you don't see conflict markers, but I'd have to understand this stuff better to be sure) -- Eric Kow <http://www.nltg.brighton.ac.uk/home/Eric.Kow> PGP Key ID: 08AC04F9
pgpTrDJatlljS.pgp
Description: PGP signature
_______________________________________________ darcs-users mailing list [email protected] http://lists.osuosl.org/mailman/listinfo/darcs-users
