Pekka Pessi writes: > 2007/10/25, Stephen J. Turnbull <[EMAIL PROTECTED]>: > > And you should. > > > I would never use a merge tool that didn't signal a conflict in this > > case (and I'm pretty sure Darcs will, btw). > > Perhaps you should not use darcs. [...] > Thu Oct 25 03:45:32 EEST 2007 Pekka Pessi <[EMAIL PROTECTED]> > * a > Shall I pull this patch? (1/1) [ynWvpxqadjk], or ? for help: y > > Finished pulling and applying.
Yuck. You're right, that sorta kills it for me---I'll stick to any old SCM that interfaces with ediff. But then why, pray tell, does Darcs insist on signaling conflicts for ChangeLogs? _______________________________________________ darcs-users mailing list [email protected] http://lists.osuosl.org/mailman/listinfo/darcs-users
